diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2007-05-19 23:12:46 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2007-05-19 23:12:46 +0000 |
| commit | caf49fb0438e9493456b59cf9eab845e0e568e2a (patch) | |
| tree | c9979007c35f2c096b6e96632d8f79d4c2e0c2e2 /lisp/loadup.el | |
| parent | 80ca7302d820bd3460a06db39165bbc35144c684 (diff) | |
| download | emacs-caf49fb0438e9493456b59cf9eab845e0e568e2a.tar.gz | |
* loadup.el: Load mac-win on a Mac. Avoid loading both x-win and
mac-win.
* term/mac-win.el:
(mac-initialize-window-system): New function. Move global setup
here.
* s/darwin.h (SYSTEM_PURESIZE_EXTRA): Define here.
(SYSTEM_PURESIZE_EXTRA): Only define on Carbon.
* emacsclient.c (decode_options): Don't use a tty on mac carbon.
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 8c03610043d..d9362158380 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -212,7 +212,7 @@ (if (eq system-type 'macos) (progn (load "ls-lisp"))) -(if (eq system-type 'darwin) +(if (and (eq system-type 'darwin) (not (featurep 'x))) (progn (load "term/mac-win"))) (if (fboundp 'atan) ; preload some constants and |