/[emacs]/emacs/src/keyboard.c
ViewVC logotype

Diff of /emacs/src/keyboard.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.836 by mituharu, Thu Aug 25 08:20:12 2005 UTC revision 1.837 by rms, Sun Sep 25 23:49:15 2005 UTC
# Line 474  int input_pending; Line 474  int input_pending;
474    
475  int meta_key;  int meta_key;
476    
 /* Non-zero means force key bindings update in parse_menu_item.  */  
   
 int update_menu_bindings;  
   
477  extern char *pending_malloc_warning;  extern char *pending_malloc_warning;
478    
479  /* Circular buffer for pre-read keyboard input.  */  /* Circular buffer for pre-read keyboard input.  */
# Line 7403  parse_menu_item (item, notreal, inmenuba Line 7399  parse_menu_item (item, notreal, inmenuba
7399        else        else
7400          def = AREF (item_properties, ITEM_PROPERTY_DEF);          def = AREF (item_properties, ITEM_PROPERTY_DEF);
7401    
7402        if (!update_menu_bindings)        if (NILP (XCAR (cachelist))) /* Have no saved key.  */
         chkcache = 0;  
       else if (NILP (XCAR (cachelist))) /* Have no saved key.  */  
7403          {          {
7404            if (newcache          /* Always check first time.  */            if (newcache          /* Always check first time.  */
7405                /* Should we check everything when precomputing key                /* Should we check everything when precomputing key
# Line 11409  suppressed only after special commands t Line 11403  suppressed only after special commands t
11403  `disable-point-adjustment' (which see) to non-nil.  */);  `disable-point-adjustment' (which see) to non-nil.  */);
11404    Vglobal_disable_point_adjustment = Qnil;    Vglobal_disable_point_adjustment = Qnil;
11405    
   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;  
   
11406    DEFVAR_LISP ("minibuffer-message-timeout", &Vminibuffer_message_timeout,    DEFVAR_LISP ("minibuffer-message-timeout", &Vminibuffer_message_timeout,
11407                 doc: /* *How long to display an echo-area message when the minibuffer is active.                 doc: /* *How long to display an echo-area message when the minibuffer is active.
11408  If the value is not a number, such messages don't time out.  */);  If the value is not a number, such messages don't time out.  */);

Legend:
Removed from v.1.836  
changed lines
  Added in v.1.837

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26