diff options
| author | Adrian Robert | 2008-07-15 18:15:18 +0000 |
|---|---|---|
| committer | Adrian Robert | 2008-07-15 18:15:18 +0000 |
| commit | edfda78355c5528eee489fa8a7f9c73bf8e734f2 (patch) | |
| tree | 78d2414d9791e1efc17ec9b35b438ae35602340a /lisp/loadup.el | |
| parent | 1391cd548782097e34d7856ec4f20ca90bdf2c26 (diff) | |
| download | emacs-edfda78355c5528eee489fa8a7f9c73bf8e734f2.tar.gz emacs-edfda78355c5528eee489fa8a7f9c73bf8e734f2.zip | |
merging Emacs.app (NeXTstep port)
Diffstat (limited to 'lisp/loadup.el')
| -rw-r--r-- | lisp/loadup.el | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el index eb51d10ee9e..bd4d08b0449 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el | |||
| @@ -212,6 +212,11 @@ | |||
| 212 | (if (featurep 'mac-carbon) | 212 | (if (featurep 'mac-carbon) |
| 213 | (progn | 213 | (progn |
| 214 | (load "term/mac-win"))) | 214 | (load "term/mac-win"))) |
| 215 | (if (featurep 'ns-windowing) | ||
| 216 | (progn | ||
| 217 | (load "emacs-lisp/easymenu") ;; for platform-related menu adjustments | ||
| 218 | (load "emacs-lisp/easy-mmode") | ||
| 219 | (load "term/ns-win"))) | ||
| 215 | (if (fboundp 'atan) ; preload some constants and | 220 | (if (fboundp 'atan) ; preload some constants and |
| 216 | (progn ; floating pt. functions if we have float support. | 221 | (progn ; floating pt. functions if we have float support. |
| 217 | (load "emacs-lisp/float-sup"))) | 222 | (load "emacs-lisp/float-sup"))) |