Mercurial > emacs
comparison src/s/darwin.h @ 86251:ec2f30e07030
* term/mac-win.el (x-setup-function-keys): Only setup
local-function-key-map if it has not been setup already for the
current frame. Move the suspend-emacs processing here.
* s/darwin.h (MULTI_KBOARD): Remove.
* macfns.c (x_create_tip_frame, Fx_create_frame)
(x_create_tip_frame): Don't deal with MULTI_KBOARD.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Tue, 20 Nov 2007 17:58:52 +0000 |
| parents | ccd6d86fd9a6 |
| children | 107ccd98fa12 53108e6cea98 |
comparison
equal
deleted
inserted
replaced
| 86250:9a2cbd44a899 | 86251:ec2f30e07030 |
|---|---|
| 51 #ifdef HAVE_CARBON | 51 #ifdef HAVE_CARBON |
| 52 #define MAC_OS | 52 #define MAC_OS |
| 53 /* We need a little extra space, see ../../lisp/loadup.el. */ | 53 /* We need a little extra space, see ../../lisp/loadup.el. */ |
| 54 #define SYSTEM_PURESIZE_EXTRA 30000 | 54 #define SYSTEM_PURESIZE_EXTRA 30000 |
| 55 | 55 |
| 56 /* XXX The MULTI_KBOARD support does not work yet on this platform. */ | |
| 57 #undef MULTI_KBOARD | |
| 58 | |
| 59 #endif | 56 #endif |
| 60 #endif | 57 #endif |
| 61 | 58 |
| 62 /* SYSTEM_TYPE should indicate the kind of system you are using. | 59 /* SYSTEM_TYPE should indicate the kind of system you are using. |
| 63 It sets the Lisp variable system-type. */ | 60 It sets the Lisp variable system-type. */ |