Mercurial > emacs
changeset 85209:c4472165ba35
* cus-start.el (all): Use the same test as the 22.2 branch.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Fri, 12 Oct 2007 23:40:42 +0000 |
| parents | 8d5ae38b1b47 |
| children | 782f0bc49c07 |
| files | lisp/ChangeLog lisp/cus-start.el |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Oct 12 19:36:28 2007 +0000 +++ b/lisp/ChangeLog Fri Oct 12 23:40:42 2007 +0000 @@ -1,3 +1,7 @@ +2007-10-12 Dan Nicolaescu <dann@ics.uci.edu> + + * cus-start.el (all): Use the same test as the 22.2 branch. + 2007-10-12 Stefan Monnier <monnier@iro.umontreal.ca> * diff-mode.el (diff-current-defun): Force recomputation of
--- a/lisp/cus-start.el Fri Oct 12 19:36:28 2007 +0000 +++ b/lisp/cus-start.el Fri Oct 12 23:40:42 2007 +0000 @@ -433,7 +433,7 @@ ((string-match "\\`w32-" (symbol-name symbol)) (eq system-type 'windows-nt)) ((string-match "\\`mac-" (symbol-name symbol)) - (or (eq system-type 'mac) (eq system-type 'darwin))) + (eq window-system 'mac)) ((string-match "\\`x-.*gtk" (symbol-name symbol)) (featurep 'gtk)) ((string-match "\\`x-" (symbol-name symbol))