diff options
| author | Dan Nicolaescu <[email protected]> | 2007-05-19 23:12:46 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <[email protected]> | 2007-05-19 23:12:46 +0000 |
| commit | caf49fb0438e9493456b59cf9eab845e0e568e2a (patch) | |
| tree | c9979007c35f2c096b6e96632d8f79d4c2e0c2e2 /src/s | |
| parent | 80ca7302d820bd3460a06db39165bbc35144c684 (diff) | |
* 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/s')
| -rw-r--r-- | src/s/darwin.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/s/darwin.h b/src/s/darwin.h index 72ed8964a7..2cc6ef1cdf 100644 --- a/src/s/darwin.h +++ b/src/s/darwin.h @@ -50,12 +50,10 @@ Boston, MA 02110-1301, USA. */ #ifdef MAC_OSX #ifdef HAVE_CARBON #define MAC_OS -#endif -#endif - /* We need a little extra space, see ../../lisp/loadup.el. */ #define SYSTEM_PURESIZE_EXTRA 30000 - +#endif +#endif /* SYSTEM_TYPE should indicate the kind of system you are using. It sets the Lisp variable system-type. */ |