Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Expunge unused recompute-lucid-menubar, lucid-menu-bar-dirty-flag

Browse source 
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.
This commit is contained in:
Alan Mackenzie 2022-07-12 09:31:08 +00:00
parent 93b31707e9
commit fe5e789ff8
6 changed files with 0 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/haikumenu.c
View file

@ -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)));

11
src/keyboard.c
View file

@ -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,

2
src/nsmenu.m
View file

@ -207,8 +207,6 @@
/* 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)));

2
src/pgtkmenu.c
View file

@ -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)));

3
src/xdisp.c
View file

@ -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;

2
src/xmenu.c
View file

@ -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)));