Mercurial > emacs
comparison src/keyboard.c @ 65692:b4317398b284
(update_menu_bindings): Variable deleted.
(syms_of_keyboard): Don't defvar it.
(parse_menu_item): Don't test it.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Sun, 25 Sep 2005 23:49:15 +0000 |
parents | 2aed3dcccd0d |
children | 9bbfc8301ea6 b1c1fc853d2f |
comparison
equal
deleted
inserted
replaced
65691:cb3218d6e82a | 65692:b4317398b284 |
---|---|
471 | 471 |
472 /* 1 if should obey 0200 bit in input chars as "Meta", 2 if should | 472 /* 1 if should obey 0200 bit in input chars as "Meta", 2 if should |
473 keep 0200 bit in input chars. 0 to ignore the 0200 bit. */ | 473 keep 0200 bit in input chars. 0 to ignore the 0200 bit. */ |
474 | 474 |
475 int meta_key; | 475 int meta_key; |
476 | |
477 /* Non-zero means force key bindings update in parse_menu_item. */ | |
478 | |
479 int update_menu_bindings; | |
480 | 476 |
481 extern char *pending_malloc_warning; | 477 extern char *pending_malloc_warning; |
482 | 478 |
483 /* Circular buffer for pre-read keyboard input. */ | 479 /* Circular buffer for pre-read keyboard input. */ |
484 | 480 |
7401 prefix = XCDR (prefix); | 7397 prefix = XCDR (prefix); |
7402 } | 7398 } |
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 |
7412 bindings? */ | 7406 bindings? */ |
7413 /* If something had no key binding before, don't recheck it | 7407 /* If something had no key binding before, don't recheck it |
11406 | 11400 |
11407 The default value is nil, in which case, point adjustment are | 11401 The default value is nil, in which case, point adjustment are |
11408 suppressed only after special commands that set | 11402 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 | |
11412 DEFVAR_BOOL ("update-menu-bindings", &update_menu_bindings, | |
11413 doc: /* Non-nil means updating menu bindings is allowed. | |
11414 A value of nil means menu bindings should not be updated. | |
11415 Used during Emacs' startup. */); | |
11416 update_menu_bindings = 1; | |
11417 | 11405 |
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. |
11420 If the value is not a number, such messages don't time out. */); | 11408 If the value is not a number, such messages don't time out. */); |
11421 Vminibuffer_message_timeout = make_number (2); | 11409 Vminibuffer_message_timeout = make_number (2); |