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.

diff --git a/src/haikumenu.c b/src/haikumenu.c
index 3f68eadfd93ae89a1218ba1d5a1aa98852cd15bd..929ed952105a65052541be1ec1e9fbc2bae1d409 100644 (file)
--- 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 1d505c13be3fbd04043a82b97418cebef194218d..c729d5dfb3e5650313de4973f2d396883480a7d5 100644 (file)
--- 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 d02d7bae4b5c7c40dcf93eeb7687fdd0c759fcda..ae795a0d22b7ad36428b4a0e559f7ce08c539e61 100644 (file)
--- 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 2eabf6ac1bc64f707311bced6749e65ae6d87abc..d147f4b4168711b7eb3b3e320d36f918176f2bc1 100644 (file)
--- 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 4089525e10f6e265baee9685453238da27384690..f205327cc343c477a84e78e750ce9d8f0611b173 100644 (file)
--- 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 c006d2bfe211dffd28ecfd205392f9111fecfb79..e5e24b87d167366924a02e9fc8c0ab47aeb76668 100644 (file)
--- 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)));