diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/macfns.c | 12 | ||||
| -rw-r--r-- | src/macterm.c | 2 | ||||
| -rw-r--r-- | src/s/darwin.h | 3 |
4 files changed, 7 insertions, 17 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 4113948bc97..dda5b989775 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2007-11-20 Dan Nicolaescu <dann@ics.uci.edu> + + * 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. + 2007-11-19 Stefan Monnier <monnier@iro.umontreal.ca> * buffer.c (Fbuffer_local_value): Remove redundant test. 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; diff --git a/src/macterm.c b/src/macterm.c index 5ea8f0ba607..bc33cfe472e 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -12823,7 +12823,6 @@ mac_create_terminal (struct mac_display_info *dpyinfo) /* FIXME: This keyboard setup is 100% untested, just copied from w32_create_terminal in order to set window-system now that it's a keyboard object. */ -#ifdef MULTI_KBOARD /* We don't yet support separate terminals on Mac, so don't try to share keyboards between virtual terminals that are on the same physical terminal like X does. */ @@ -12838,7 +12837,6 @@ mac_create_terminal (struct mac_display_info *dpyinfo) if (current_kboard == initial_kboard) current_kboard = terminal->kboard; terminal->kboard->reference_count++; -#endif return terminal; } 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. */ /* We need a little extra space, see ../../lisp/loadup.el. */ #define SYSTEM_PURESIZE_EXTRA 30000 -/* XXX The MULTI_KBOARD support does not work yet on this platform. */ -#undef MULTI_KBOARD - #endif #endif |