diff options
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. */) | |||
| 2547 | if (EQ (display, Qunbound)) | 2547 | if (EQ (display, Qunbound)) |
| 2548 | display = Qnil; | 2548 | display = Qnil; |
| 2549 | dpyinfo = check_x_display_info (display); | 2549 | dpyinfo = check_x_display_info (display); |
| 2550 | #ifdef MULTI_KBOARD | ||
| 2551 | kb = dpyinfo->terminal->kboard; | 2550 | kb = dpyinfo->terminal->kboard; |
| 2552 | #else | ||
| 2553 | kb = &the_only_kboard; | ||
| 2554 | #endif | ||
| 2555 | 2551 | ||
| 2556 | name = mac_get_arg (parameters, Qname, "name", "Name", RES_TYPE_STRING); | 2552 | name = mac_get_arg (parameters, Qname, "name", "Name", RES_TYPE_STRING); |
| 2557 | if (!STRINGP (name) | 2553 | if (!STRINGP (name) |
| @@ -2615,9 +2611,7 @@ This function is an internal primitive--use `make-frame' instead. */) | |||
| 2615 | image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount; | 2611 | image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount; |
| 2616 | dpyinfo_refcount = dpyinfo->reference_count; | 2612 | dpyinfo_refcount = dpyinfo->reference_count; |
| 2617 | #endif /* GLYPH_DEBUG */ | 2613 | #endif /* GLYPH_DEBUG */ |
| 2618 | #ifdef MULTI_KBOARD | ||
| 2619 | FRAME_KBOARD (f) = kb; | 2614 | FRAME_KBOARD (f) = kb; |
| 2620 | #endif | ||
| 2621 | 2615 | ||
| 2622 | /* Specify the parent under which to make this window. */ | 2616 | /* Specify the parent under which to make this window. */ |
| 2623 | 2617 | ||
| @@ -3809,11 +3803,7 @@ x_create_tip_frame (dpyinfo, parms, text) | |||
| 3809 | 3803 | ||
| 3810 | parms = Fcopy_alist (parms); | 3804 | parms = Fcopy_alist (parms); |
| 3811 | 3805 | ||
| 3812 | #ifdef MULTI_KBOARD | ||
| 3813 | kb = dpyinfo->terminal->kboard; | 3806 | kb = dpyinfo->terminal->kboard; |
| 3814 | #else | ||
| 3815 | kb = &the_only_kboard; | ||
| 3816 | #endif | ||
| 3817 | 3807 | ||
| 3818 | /* Get the name of the frame to use for resource lookup. */ | 3808 | /* Get the name of the frame to use for resource lookup. */ |
| 3819 | name = mac_get_arg (parms, Qname, "name", "Name", RES_TYPE_STRING); | 3809 | name = mac_get_arg (parms, Qname, "name", "Name", RES_TYPE_STRING); |
| @@ -3859,9 +3849,7 @@ x_create_tip_frame (dpyinfo, parms, text) | |||
| 3859 | image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount; | 3849 | image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount; |
| 3860 | dpyinfo_refcount = dpyinfo->reference_count; | 3850 | dpyinfo_refcount = dpyinfo->reference_count; |
| 3861 | #endif /* GLYPH_DEBUG */ | 3851 | #endif /* GLYPH_DEBUG */ |
| 3862 | #ifdef MULTI_KBOARD | ||
| 3863 | FRAME_KBOARD (f) = kb; | 3852 | FRAME_KBOARD (f) = kb; |
| 3864 | #endif | ||
| 3865 | f->output_data.mac->parent_desc = FRAME_MAC_DISPLAY_INFO (f)->root_window; | 3853 | f->output_data.mac->parent_desc = FRAME_MAC_DISPLAY_INFO (f)->root_window; |
| 3866 | f->output_data.mac->explicit_parent = 0; | 3854 | f->output_data.mac->explicit_parent = 0; |
| 3867 | 3855 | ||