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 /src/frame.c | |
| 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 'src/frame.c')
| -rw-r--r-- | src/frame.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/frame.c b/src/frame.c index 859802995af..5b8f9acaf0c 100644 --- a/src/frame.c +++ b/src/frame.c @@ -702,7 +702,9 @@ affects all frames on the same terminal device. */) abort (); #else /* not MSDOS */ -#ifdef MAC_OS +#if 0 /* #ifdef MAC_OS */ + /* This can happen for multi-tty when using both terminal frames and + Carbon frames. */ if (sf->output_method != output_mac) error ("Not running on a Macintosh screen; cannot make a new Macintosh frame"); #else |