summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Mackenzie <acm@muc.de>2022-07-12 09:31:08 +0000
committerAlan Mackenzie <acm@muc.de>2022-07-12 09:31:08 +0000
commitfe5e789ff84d3b41b2a22cc18fd0a208502fede5 (patch)
tree5fa985d5fe17c30cd1354e31451c9da8495cae00
parent93b31707e97f8ddf11aa8acbf5c61bc29b5f7528 (diff)
downloademacs-fe5e789ff84d3b41b2a22cc18fd0a208502fede5.tar.gz
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.
-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)
/* If it has changed current-menubar from previous value,
really recompute the menubar from the value. */
- if (! NILP (Vlucid_menu_bar_dirty_flag))
- call0 (Qrecompute_lucid_menubar);
safe_run_hooks (Qmenu_bar_update_hook);
fset_menu_bar_items (f, menu_bar_items (FRAME_MENU_BAR_ITEMS (f)));
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)
}
}
- /* If it has changed current-menubar from previous value,
- really recompute the menubar from the value. */
- if (! NILP (Vlucid_menu_bar_dirty_flag)
- && !NILP (Ffboundp (Qrecompute_lucid_menubar)))
- call0 (Qrecompute_lucid_menubar);
-
Vthis_command = Qnil;
Vreal_this_command = Qnil;
Vthis_original_command = Qnil;
@@ -12184,7 +12178,6 @@ syms_of_keyboard (void)
apply_modifiers. */
DEFSYM (Qmodifier_cache, "modifier-cache");
- DEFSYM (Qrecompute_lucid_menubar, "recompute-lucid-menubar");
DEFSYM (Qactivate_menubar_hook, "activate-menubar-hook");
DEFSYM (Qpolling_period, "polling-period");
@@ -12665,10 +12658,6 @@ See also `pre-command-hook'. */);
Fset (Qecho_area_clear_hook, Qnil);
- DEFVAR_LISP ("lucid-menu-bar-dirty-flag", Vlucid_menu_bar_dirty_flag,
- doc: /* Non-nil means menu bar, specified Lucid style, needs to be recomputed. */);
- Vlucid_menu_bar_dirty_flag = Qnil;
-
#ifdef USE_LUCID
DEFVAR_BOOL ("lucid--menu-grab-keyboard",
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)
/* If it has changed current-menubar from previous value,
really recompute the menubar from the value. */
- if (! NILP (Vlucid_menu_bar_dirty_flag))
- call0 (Qrecompute_lucid_menubar);
safe_run_hooks (Qmenu_bar_update_hook);
fset_menu_bar_items (f, menu_bar_items (FRAME_MENU_BAR_ITEMS (f)));
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)
/* If it has changed current-menubar from previous value,
really recompute the menubar from the value. */
- if (!NILP (Vlucid_menu_bar_dirty_flag))
- call0 (Qrecompute_lucid_menubar);
safe_run_hooks (Qmenu_bar_update_hook);
fset_menu_bar_items (f, menu_bar_items (FRAME_MENU_BAR_ITEMS (f)));
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)
/* If it has changed current-menubar from previous value,
really recompute the menu-bar from the value. */
- if (! NILP (Vlucid_menu_bar_dirty_flag))
- call0 (Qrecompute_lucid_menubar);
-
safe_run_hooks (Qmenu_bar_update_hook);
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)
/* If it has changed current-menubar from previous value,
really recompute the menubar from the value. */
- if (! NILP (Vlucid_menu_bar_dirty_flag))
- call0 (Qrecompute_lucid_menubar);
safe_run_hooks (Qmenu_bar_update_hook);
fset_menu_bar_items (f, menu_bar_items (FRAME_MENU_BAR_ITEMS (f)));