diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2007-11-20 17:58:52 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2007-11-20 17:58:52 +0000 |
| commit | 202c09a889e637eb4162db551252c80bbf46b02b (patch) | |
| tree | 91c9a3f493ce067ab3d389783a683348cb1c6b45 /src/macfns.c | |
| parent | 1571d112d97475f53d99a3aff303139ff6ac748b (diff) | |
| download | emacs-202c09a889e637eb4162db551252c80bbf46b02b.tar.gz | |
* 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/macfns.c')
| -rw-r--r-- | src/macfns.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/macfns.c b/src/macfns.c index 1622576f073..7afeaafd85b 100644 --- a/src/macfns.c +++ b/src/macfns.c @@ -2547,11 +2547,7 @@ This function is an internal primitive--use `make-frame' instead. */) if (EQ (display, Qunbound)) display = Qnil; dpyinfo = check_x_display_info (display); -#ifdef MULTI_KBOARD kb = dpyinfo->terminal->kboard; -#else - kb = &the_only_kboard; -#endif name = mac_get_arg (parameters, Qname, "name", "Name", RES_TYPE_STRING); if (!STRINGP (name) @@ -2615,9 +2611,7 @@ This function is an internal primitive--use `make-frame' instead. */) image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount; dpyinfo_refcount = dpyinfo->reference_count; #endif /* GLYPH_DEBUG */ -#ifdef MULTI_KBOARD FRAME_KBOARD (f) = kb; -#endif /* Specify the parent under which to make this window. */ @@ -3809,11 +3803,7 @@ x_create_tip_frame (dpyinfo, parms, text) parms = Fcopy_alist (parms); -#ifdef MULTI_KBOARD kb = dpyinfo->terminal->kboard; -#else - kb = &the_only_kboard; -#endif /* Get the name of the frame to use for resource lookup. */ name = mac_get_arg (parms, Qname, "name", "Name", RES_TYPE_STRING); @@ -3859,9 +3849,7 @@ x_create_tip_frame (dpyinfo, parms, text) image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount; dpyinfo_refcount = dpyinfo->reference_count; #endif /* GLYPH_DEBUG */ -#ifdef MULTI_KBOARD FRAME_KBOARD (f) = kb; -#endif f->output_data.mac->parent_desc = FRAME_MAC_DISPLAY_INFO (f)->root_window; f->output_data.mac->explicit_parent = 0; |