diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/xdisp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 0c714f50775..6a426f80b5c 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -1307,7 +1307,7 @@ update_menu_bar (f, save_match_data) | |||
| 1307 | call1 (Vrun_hooks, Qmenu_bar_update_hook); | 1307 | call1 (Vrun_hooks, Qmenu_bar_update_hook); |
| 1308 | FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f)); | 1308 | FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f)); |
| 1309 | #ifdef USE_X_TOOLKIT | 1309 | #ifdef USE_X_TOOLKIT |
| 1310 | set_frame_menubar (f, 0); | 1310 | set_frame_menubar (f, 0, 0); |
| 1311 | #endif /* USE_X_TOOLKIT */ | 1311 | #endif /* USE_X_TOOLKIT */ |
| 1312 | 1312 | ||
| 1313 | unbind_to (count, Qnil); | 1313 | unbind_to (count, Qnil); |
| @@ -4206,8 +4206,8 @@ If this is zero, point is always centered after it moves off frame."); | |||
| 4206 | DEFVAR_BOOL ("multiple-frames", &multiple_frames, | 4206 | DEFVAR_BOOL ("multiple-frames", &multiple_frames, |
| 4207 | "Non-nil if more than one frame is visible on this display.\n\ | 4207 | "Non-nil if more than one frame is visible on this display.\n\ |
| 4208 | Minibuffer-only frames don't count, but iconified frames do.\n\ | 4208 | Minibuffer-only frames don't count, but iconified frames do.\n\ |
| 4209 | This variable is not guaranteed to be accurate except while parsing\n\ | 4209 | This variable is not guaranteed to be accurate except while processing\n\ |
| 4210 | frame-title-format."); | 4210 | `frame-title-format' and `icon-title-format'."); |
| 4211 | 4211 | ||
| 4212 | DEFVAR_LISP ("frame-title-format", &Vframe_title_format, | 4212 | DEFVAR_LISP ("frame-title-format", &Vframe_title_format, |
| 4213 | "Template for displaying the titlebar of visible frames.\n\ | 4213 | "Template for displaying the titlebar of visible frames.\n\ |