Mercurial > emacs
comparison src/s/darwin.h @ 83620:ce4352d8bee9
* 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.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Sat, 19 May 2007 23:12:46 +0000 |
| parents | 5da6a46ddbd6 |
| children | 65663fcd2caa |
comparison
equal
deleted
inserted
replaced
| 83619:5da6a46ddbd6 | 83620:ce4352d8bee9 |
|---|---|
| 48 /* MAC_OS is used to conditionally compile code common to both MAC_OS8 | 48 /* MAC_OS is used to conditionally compile code common to both MAC_OS8 |
| 49 and MAC_OSX. */ | 49 and MAC_OSX. */ |
| 50 #ifdef MAC_OSX | 50 #ifdef MAC_OSX |
| 51 #ifdef HAVE_CARBON | 51 #ifdef HAVE_CARBON |
| 52 #define MAC_OS | 52 #define MAC_OS |
| 53 #endif | |
| 54 #endif | |
| 55 | |
| 56 /* We need a little extra space, see ../../lisp/loadup.el. */ | 53 /* We need a little extra space, see ../../lisp/loadup.el. */ |
| 57 #define SYSTEM_PURESIZE_EXTRA 30000 | 54 #define SYSTEM_PURESIZE_EXTRA 30000 |
| 58 | 55 #endif |
| 56 #endif | |
| 59 | 57 |
| 60 /* SYSTEM_TYPE should indicate the kind of system you are using. | 58 /* SYSTEM_TYPE should indicate the kind of system you are using. |
| 61 It sets the Lisp variable system-type. */ | 59 It sets the Lisp variable system-type. */ |
| 62 | 60 |
| 63 #define SYSTEM_TYPE "darwin" | 61 #define SYSTEM_TYPE "darwin" |