diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2008-07-23 06:01:21 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2008-07-23 06:01:21 +0000 |
| commit | 8eea56f184b3b9e59c486983a0b03c193be4aa3f (patch) | |
| tree | dd8c0a458c25bc3501e345bc849880e0ff6660b4 /lisp/loadup.el | |
| parent | 577d1d9363742ea76960676af8f291b62aea48ff (diff) | |
| download | emacs-8eea56f184b3b9e59c486983a0b03c193be4aa3f.tar.gz | |
* term/ns-win.el:
* version.el (emacs-version):
* loadup.el:
* frame.el (make-frame-on-display): Check for ns instead of
ns-windowing.
Diffstat (limited to 'lisp/loadup.el')
| -rw-r--r-- | lisp/loadup.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el index 64433b2058a..e444fc5dcaa 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -214,7 +214,7 @@ (if (featurep 'mac-carbon) (progn (load "term/mac-win"))) -(if (featurep 'ns-windowing) +(if (featurep 'ns) (progn (load "emacs-lisp/easymenu") ;; for platform-related menu adjustments (load "term/ns-win"))) |