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 | 601fb9b822b020e1b9566b0a60874c1de89df0b2 (patch) | |
tree | c63b62244c6799db334dfc7ccee2572481cb9175 /lisp/loadup.el | |
parent | 89e87059eb601cd685e4eee5649b7781b65a208c (diff) | |
download | emacs-601fb9b822b020e1b9566b0a60874c1de89df0b2.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"))) |