[Emacs-diffs] Changes to emacs/src/keyboard.c

[Richard M . Stallman]

Index: emacs/src/keyboard.c
diff -c emacs/src/keyboard.c:1.836 emacs/src/keyboard.c:1.837
*** emacs/src/keyboard.c:1.836  Thu Aug 25 08:20:12 2005
--- emacs/src/keyboard.c        Sun Sep 25 23:49:15 2005
***************
*** 474,483 ****
  
  int meta_key;
  
- /* Non-zero means force key bindings update in parse_menu_item.  */
- 
- int update_menu_bindings;
- 
  extern char *pending_malloc_warning;
  
  /* Circular buffer for pre-read keyboard input.  */
--- 474,479 ----
***************
*** 7403,7411 ****
        else
        def = AREF (item_properties, ITEM_PROPERTY_DEF);
  
!       if (!update_menu_bindings)
!       chkcache = 0;
!       else if (NILP (XCAR (cachelist))) /* Have no saved key.  */
        {
          if (newcache          /* Always check first time.  */
              /* Should we check everything when precomputing key
--- 7399,7405 ----
        else
        def = AREF (item_properties, ITEM_PROPERTY_DEF);
  
!       if (NILP (XCAR (cachelist))) /* Have no saved key.  */
        {
          if (newcache          /* Always check first time.  */
              /* Should we check everything when precomputing key
***************
*** 11408,11419 ****
  suppressed only after special commands that set
  `disable-point-adjustment' (which see) to non-nil.  */);
    Vglobal_disable_point_adjustment = Qnil;
- 
-   DEFVAR_BOOL ("update-menu-bindings", &update_menu_bindings,
-              doc: /* Non-nil means updating menu bindings is allowed.
- A value of nil means menu bindings should not be updated.
- Used during Emacs' startup.  */);
-   update_menu_bindings = 1;
  
    DEFVAR_LISP ("minibuffer-message-timeout", &Vminibuffer_message_timeout,
               doc: /* *How long to display an echo-area message when the 
minibuffer is active.
--- 11402,11407 ----