Make tty-menu-open-use-tmm a defcustom, update tmm docs accordingly.

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 41a02019039554bfdb439fba008e201026a86e67..400c65e505be1d63b84ecb4a91d9514813cfce8f 100644 (file)
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -2340,9 +2340,16 @@ If nil, the current mouse position is used."
   "Keymap used while processing TTY menus.")
 
 
-;; FIXME: Make this a defcustom!
-(defvar tty-menu-open-use-tmm nil
-  "If non-nil, menu-bar-open on a TTY will invoke `tmm-menubar'.")
+(defcustom tty-menu-open-use-tmm nil
+  "If non-nil, \\[menu-bar-open] on a TTY will invoke `tmm-menubar'.
+
+If nil, \\[menu-bar-open] will drop down the menu corresponding to the
+first (leftmost) menu-bar item; you can select other items by typing
+\\[forward-char], \\[backward-char], \\[right-char] and \\[left-char]."
+  :type '(choice (const :tag "F10 drops down TTY menus" nil)
+                (const :tag "F10 invokes tmm-menubar" t))
+  :group 'display
+  :version "24.4")
 
 (defvar tty-menu--initial-menu-x 10
   "X coordinate of the first menu-bar menu dropped by F10.

diff --git a/lisp/tmm.el b/lisp/tmm.el
index cd91742649d89977d294876a83ed3d068eca47a0..36c11a0f4b0e24c9a423234bc7e78bd68e4f65d4 100644 (file)
--- a/lisp/tmm.el
+++ b/lisp/tmm.el
@@ -50,7 +50,11 @@
   "Text-mode emulation of looking and choosing from a menubar.
 See the documentation for `tmm-prompt'.
 X-POSITION, if non-nil, specifies a horizontal position within the menu bar;
-we make that menu bar item (the one at that position) the default choice."
+we make that menu bar item (the one at that position) the default choice.
+
+Note that \\[menu-bar-open] by default drops down TTY menus; if you want it
+to invoke `tmm-menubar' instead, customize the variable
+\`tty-menu-open-use-tmm' to a non-nil value."
   (interactive)
   (run-hooks 'menu-bar-update-hook)
   ;; Obey menu-bar-final-items; put those items last.

diff --git a/src/menu.c b/src/menu.c
index 447faf60b1f60235c97b4b9dc98e9ad6c23c38f1..2c787e00b6f3d66a7c9a5d8f42f85ebb86408666 100644 (file)
--- a/src/menu.c
+++ b/src/menu.c
@@ -1064,7 +1064,10 @@ Value is the symbol of the menu at X/Y, or nil if the specified
 coordinates are not within the FRAME's menu bar.  The symbol can
 be used to look up the menu like this:
 
-     (lookup-key global-map [menu-bar SYMBOL])
+     (lookup-key MAP [menu-bar SYMBOL])
+
+where MAP is either the current global map or the current local map,
+since menu-bar items come from both.
 
 This function can return non-nil only on a text-terminal frame
 or on an X frame that doesn't use any GUI toolkit.  Otherwise,