aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman2005-09-25 23:49:15 +0000
committerRichard M. Stallman2005-09-25 23:49:15 +0000
commit9867523c82ffbaea5bd02a8b98f9e1844c8c7496 (patch)
tree43e7c33cc5927c0cf8555f69f87b6958a2d62552 /src
parent5fae1caef32374fffc256f7f92952398d226fff2 (diff)
downloademacs-9867523c82ffbaea5bd02a8b98f9e1844c8c7496.tar.gz
emacs-9867523c82ffbaea5bd02a8b98f9e1844c8c7496.zip
(update_menu_bindings): Variable deleted.
(syms_of_keyboard): Don't defvar it. (parse_menu_item): Don't test it.
Diffstat (limited to 'src')
-rw-r--r--src/keyboard.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index a39e2699d5f..a04f0e6dd32 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -474,10 +474,6 @@ int input_pending;
474 474
475int meta_key; 475int meta_key;
476 476
477/* Non-zero means force key bindings update in parse_menu_item. */
478
479int update_menu_bindings;
480
481extern char *pending_malloc_warning; 477extern char *pending_malloc_warning;
482 478
483/* Circular buffer for pre-read keyboard input. */ 479/* Circular buffer for pre-read keyboard input. */
@@ -7403,9 +7399,7 @@ parse_menu_item (item, notreal, inmenubar)
7403 else 7399 else
7404 def = AREF (item_properties, ITEM_PROPERTY_DEF); 7400 def = AREF (item_properties, ITEM_PROPERTY_DEF);
7405 7401
7406 if (!update_menu_bindings) 7402 if (NILP (XCAR (cachelist))) /* Have no saved key. */
7407 chkcache = 0;
7408 else if (NILP (XCAR (cachelist))) /* Have no saved key. */
7409 { 7403 {
7410 if (newcache /* Always check first time. */ 7404 if (newcache /* Always check first time. */
7411 /* Should we check everything when precomputing key 7405 /* Should we check everything when precomputing key
@@ -11409,12 +11403,6 @@ suppressed only after special commands that set
11409`disable-point-adjustment' (which see) to non-nil. */); 11403`disable-point-adjustment' (which see) to non-nil. */);
11410 Vglobal_disable_point_adjustment = Qnil; 11404 Vglobal_disable_point_adjustment = Qnil;
11411 11405
11412 DEFVAR_BOOL ("update-menu-bindings", &update_menu_bindings,
11413 doc: /* Non-nil means updating menu bindings is allowed.
11414A value of nil means menu bindings should not be updated.
11415Used during Emacs' startup. */);
11416 update_menu_bindings = 1;
11417
11418 DEFVAR_LISP ("minibuffer-message-timeout", &Vminibuffer_message_timeout, 11406 DEFVAR_LISP ("minibuffer-message-timeout", &Vminibuffer_message_timeout,
11419 doc: /* *How long to display an echo-area message when the minibuffer is active. 11407 doc: /* *How long to display an echo-area message when the minibuffer is active.
11420If the value is not a number, such messages don't time out. */); 11408If the value is not a number, such messages don't time out. */);