# HG changeset patch # User Dan Nicolaescu # Date 1192232442 0 # Node ID c4472165ba359b6cdb8e202590d06a5db72b8d35 # Parent 8d5ae38b1b47b711a2c6aa7fbd97604f5a4ae1c9 * cus-start.el (all): Use the same test as the 22.2 branch. diff -r 8d5ae38b1b47 -r c4472165ba35 lisp/ChangeLog --- 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 + + * cus-start.el (all): Use the same test as the 22.2 branch. + 2007-10-12 Stefan Monnier * diff-mode.el (diff-current-defun): Force recomputation of diff -r 8d5ae38b1b47 -r c4472165ba35 lisp/cus-start.el --- 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))