diff options
| author | Dan Nicolaescu | 2007-11-20 17:58:52 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2007-11-20 17:58:52 +0000 |
| commit | 202c09a889e637eb4162db551252c80bbf46b02b (patch) | |
| tree | 91c9a3f493ce067ab3d389783a683348cb1c6b45 /src/s | |
| parent | 1571d112d97475f53d99a3aff303139ff6ac748b (diff) | |
| download | emacs-202c09a889e637eb4162db551252c80bbf46b02b.tar.gz emacs-202c09a889e637eb4162db551252c80bbf46b02b.zip | |
* 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.
Diffstat (limited to 'src/s')
| -rw-r--r-- | src/s/darwin.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/s/darwin.h b/src/s/darwin.h index 6bfa0e95106..c1108e7c295 100644 --- a/src/s/darwin.h +++ b/src/s/darwin.h | |||
| @@ -53,9 +53,6 @@ Boston, MA 02110-1301, USA. */ | |||
| 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 | ||