From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 18 Jul 1995 23:20:50 +0000 (+0000)
Subject: Update overriding-local-map-menu-flag.
X-Git-Tag: emacs-19.34~3259
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4b4b65a6ca4d144ffce0b0856dfab2d6e31102ff;p=emacs.git

Update overriding-local-map-menu-flag.
---

diff --git a/lispref/keymaps.texi b/lispref/keymaps.texi
index adb0a8be835..e8edf59b2a0 100644
--- a/lispref/keymaps.texi
+++ b/lispref/keymaps.texi
@@ -582,21 +582,6 @@ keymap, if any, overrides all other maps that would have been active,
 except for the current global map.
 @end defvar
 
-@defvar overriding-local-map-menu-flag
-If this variable is non-@code{nil}, the value of
-@code{overriding-local-map} can affect the display of the menu bar.  The
-default value is @code{nil}, so @code{overriding-local-map} has no
-effect on the menu bar.
-
-Note that @code{overriding-local-map} does affect the execution of key
-sequences entered using the menu bar, even if it does not affect the
-menu bar display.  So if a menu bar key sequence comes in, you should
-clear @code{overriding-local-map} before looking up and executing that
-key sequence.  Modes that use @code{overriding-local-map} would
-typically do this anyway; normally they respond to events that they do
-not handle by ``unreading'' them and exiting.
-@end defvar
-
 @defvar overriding-terminal-local-map
 If non-@code{nil}, this variable holds a keymap to use instead of
 @code{overriding-local-map}, the buffer's local keymap and all the minor
@@ -607,6 +592,21 @@ buffer-local.  @xref{Multiple Displays}.  It is used to implement
 incremental search mode.
 @end defvar
 
+@defvar overriding-local-map-menu-flag
+If this variable is non-@code{nil}, the value of
+@code{overriding-local-map} or @code{overriding-terminal-local-map} can
+affect the display of the menu bar.  The default value is @code{nil}, so
+those map variables have no effect on the menu bar.
+
+Note that these two map variables do affect the execution of key
+sequences entered using the menu bar, even if they do not affect the
+menu bar display.  So if a menu bar key sequence comes in, you should
+clear the variables before looking up and executing that key sequence.
+Modes that use the variables would typically do this anyway; normally
+they respond to events that they do not handle by ``unreading'' them and
+exiting.
+@end defvar
+
 @node Key Lookup
 @section Key Lookup
 @cindex key lookup