aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlan Mackenzie2022-07-12 09:31:08 +0000
committerAlan Mackenzie2022-07-12 09:31:08 +0000
commitfe5e789ff84d3b41b2a22cc18fd0a208502fede5 (patch)
tree5fa985d5fe17c30cd1354e31451c9da8495cae00 /src
parent93b31707e97f8ddf11aa8acbf5c61bc29b5f7528 (diff)
downloademacs-fe5e789ff84d3b41b2a22cc18fd0a208502fede5.tar.gz
emacs-fe5e789ff84d3b41b2a22cc18fd0a208502fede5.zip
Expunge unused recompute-lucid-menubar, lucid-menu-bar-dirty-flag
This fixes bug #56502. That function and these variables were manipulated by the former file emacs-lisp/lmenu.el that was finally expunged from directory obsolete/ by Stefan Kangas on 2020-05-15. There remain references to them in the *.c, and *.m files. * src/keyboard.c (syms_of_keyboard): Remove declarations of the symbol and variable. * src/haikumenu.c (set_frame_menu_bar) * src/keyboard.c (command_loop_1) * src/nsmenu.m (ns_update_menubar) * src/pgtkmenu.c (set_frame_menubar) * src/xdisp.c (update_menu_bar) * src/xmenu.c (set_frame_menubar): Remove calls to Qrecompute_lucid_menubar contitional on Vlucid_menu_bar_dirty_flag.
Diffstat (limited to 'src')
-rw-r--r--src/haikumenu.c2
-rw-r--r--src/keyboard.c11
-rw-r--r--src/nsmenu.m2
-rw-r--r--src/pgtkmenu.c2
-rw-r--r--src/xdisp.c3
-rw-r--r--src/xmenu.c2
6 files changed, 0 insertions, 22 deletions
diff --git a/src/haikumenu.c b/src/haikumenu.c
index 3f68eadfd93..929ed952105 100644
--- a/src/haikumenu.c
+++ b/src/haikumenu.c
@@ -629,8 +629,6 @@ set_frame_menubar (struct frame *f, bool deep_p)
629 629
630 /* If it has changed current-menubar from previous value, 630 /* If it has changed current-menubar from previous value,
631 really recompute the menubar from the value. */ 631 really recompute the menubar from the value. */
632 if (! NILP (Vlucid_menu_bar_dirty_flag))
633 call0 (Qrecompute_lucid_menubar);
634 safe_run_hooks (Qmenu_bar_update_hook); 632 safe_run_hooks (Qmenu_bar_update_hook);
635 fset_menu_bar_items (f, menu_bar_items (FRAME_MENU_BAR_ITEMS (f))); 633 fset_menu_bar_items (f, menu_bar_items (FRAME_MENU_BAR_ITEMS (f)));
636 634
diff --git a/src/keyboard.c b/src/keyboard.c
index 1d505c13be3..c729d5dfb3e 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1371,12 +1371,6 @@ command_loop_1 (void)
1371 } 1371 }
1372 } 1372 }
1373 1373
1374 /* If it has changed current-menubar from previous value,
1375 really recompute the menubar from the value. */
1376 if (! NILP (Vlucid_menu_bar_dirty_flag)
1377 && !NILP (Ffboundp (Qrecompute_lucid_menubar)))
1378 call0 (Qrecompute_lucid_menubar);
1379
1380 Vthis_command = Qnil; 1374 Vthis_command = Qnil;
1381 Vreal_this_command = Qnil; 1375 Vreal_this_command = Qnil;
1382 Vthis_original_command = Qnil; 1376 Vthis_original_command = Qnil;
@@ -12184,7 +12178,6 @@ syms_of_keyboard (void)
12184 apply_modifiers. */ 12178 apply_modifiers. */
12185 DEFSYM (Qmodifier_cache, "modifier-cache"); 12179 DEFSYM (Qmodifier_cache, "modifier-cache");
12186 12180
12187 DEFSYM (Qrecompute_lucid_menubar, "recompute-lucid-menubar");
12188 DEFSYM (Qactivate_menubar_hook, "activate-menubar-hook"); 12181 DEFSYM (Qactivate_menubar_hook, "activate-menubar-hook");
12189 12182
12190 DEFSYM (Qpolling_period, "polling-period"); 12183 DEFSYM (Qpolling_period, "polling-period");
@@ -12665,10 +12658,6 @@ See also `pre-command-hook'. */);
12665 12658
12666 Fset (Qecho_area_clear_hook, Qnil); 12659 Fset (Qecho_area_clear_hook, Qnil);
12667 12660
12668 DEFVAR_LISP ("lucid-menu-bar-dirty-flag", Vlucid_menu_bar_dirty_flag,
12669 doc: /* Non-nil means menu bar, specified Lucid style, needs to be recomputed. */);
12670 Vlucid_menu_bar_dirty_flag = Qnil;
12671
12672#ifdef USE_LUCID 12661#ifdef USE_LUCID
12673 DEFVAR_BOOL ("lucid--menu-grab-keyboard", 12662 DEFVAR_BOOL ("lucid--menu-grab-keyboard",
12674 lucid__menu_grab_keyboard, 12663 lucid__menu_grab_keyboard,
diff --git a/src/nsmenu.m b/src/nsmenu.m
index d02d7bae4b5..ae795a0d22b 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -207,8 +207,6 @@ ns_update_menubar (struct frame *f, bool deep_p)
207 207
208 /* If it has changed current-menubar from previous value, 208 /* If it has changed current-menubar from previous value,
209 really recompute the menubar from the value. */ 209 really recompute the menubar from the value. */
210 if (! NILP (Vlucid_menu_bar_dirty_flag))
211 call0 (Qrecompute_lucid_menubar);
212 safe_run_hooks (Qmenu_bar_update_hook); 210 safe_run_hooks (Qmenu_bar_update_hook);
213 fset_menu_bar_items (f, menu_bar_items (FRAME_MENU_BAR_ITEMS (f))); 211 fset_menu_bar_items (f, menu_bar_items (FRAME_MENU_BAR_ITEMS (f)));
214 212
diff --git a/src/pgtkmenu.c b/src/pgtkmenu.c
index 2eabf6ac1bc..d147f4b4168 100644
--- a/src/pgtkmenu.c
+++ b/src/pgtkmenu.c
@@ -289,8 +289,6 @@ set_frame_menubar (struct frame *f, bool deep_p)
289 289
290 /* If it has changed current-menubar from previous value, 290 /* If it has changed current-menubar from previous value,
291 really recompute the menubar from the value. */ 291 really recompute the menubar from the value. */
292 if (!NILP (Vlucid_menu_bar_dirty_flag))
293 call0 (Qrecompute_lucid_menubar);
294 safe_run_hooks (Qmenu_bar_update_hook); 292 safe_run_hooks (Qmenu_bar_update_hook);
295 fset_menu_bar_items (f, menu_bar_items (FRAME_MENU_BAR_ITEMS (f))); 293 fset_menu_bar_items (f, menu_bar_items (FRAME_MENU_BAR_ITEMS (f)));
296 294
diff --git a/src/xdisp.c b/src/xdisp.c
index 4089525e10f..f205327cc34 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13468,9 +13468,6 @@ update_menu_bar (struct frame *f, bool save_match_data, bool hooks_run)
13468 13468
13469 /* If it has changed current-menubar from previous value, 13469 /* If it has changed current-menubar from previous value,
13470 really recompute the menu-bar from the value. */ 13470 really recompute the menu-bar from the value. */
13471 if (! NILP (Vlucid_menu_bar_dirty_flag))
13472 call0 (Qrecompute_lucid_menubar);
13473
13474 safe_run_hooks (Qmenu_bar_update_hook); 13471 safe_run_hooks (Qmenu_bar_update_hook);
13475 13472
13476 hooks_run = true; 13473 hooks_run = true;
diff --git a/src/xmenu.c b/src/xmenu.c
index c006d2bfe21..e5e24b87d16 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -976,8 +976,6 @@ set_frame_menubar (struct frame *f, bool deep_p)
976 976
977 /* If it has changed current-menubar from previous value, 977 /* If it has changed current-menubar from previous value,
978 really recompute the menubar from the value. */ 978 really recompute the menubar from the value. */
979 if (! NILP (Vlucid_menu_bar_dirty_flag))
980 call0 (Qrecompute_lucid_menubar);
981 safe_run_hooks (Qmenu_bar_update_hook); 979 safe_run_hooks (Qmenu_bar_update_hook);
982 fset_menu_bar_items (f, menu_bar_items (FRAME_MENU_BAR_ITEMS (f))); 980 fset_menu_bar_items (f, menu_bar_items (FRAME_MENU_BAR_ITEMS (f)));
983 981