Merge from origin/emacs-25

c4a5e7e Improve documentation of 'menu-bar-open'

2 files changed, 9 insertions, 3 deletions

diff --git a/doc/emacs/screen.texi b/doc/emacs/screen.texi
index 580df5fe8ff..716575706cf 100644
--- a/doc/emacs/screen.texi
+++ b/doc/emacs/screen.texi
@@ -304,7 +304,10 @@ the usual way (@pxref{Key Help}).
 item by pressing @key{F10} (to run the command @code{menu-bar-open}).
 You can then navigate the menus with the arrow keys.  To activate a
 selected menu item, press @key{RET}; to cancel menu navigation, press
-@kbd{C-g} or @kbd{@key{ESC} @key{ESC} @key{ESC}}.
+@kbd{C-g} or @kbd{@key{ESC} @key{ESC} @key{ESC}}.  (However, note that
+when Emacs was built with a GUI toolkit, the menus are drawn and
+controlled by the toolkit, and the key sequences to cancel menu
+navigation might be different from the above description.)
 
 @kindex M-`
 @findex tmm-menubar
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 8f3eaa2c029..f705ec17a55 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -177,12 +177,15 @@ the last file dropped is selected."
 
  ;;; make f10 activate the real menubar rather than the mini-buffer menu
  ;;; navigation feature.
- (defun w32-menu-bar-open (&optional frame)
+(defun w32-menu-bar-open (&optional frame)
    "Start key navigation of the menu bar in FRAME.
 
 This initially activates the first menu-bar item, and you can then navigate
 with the arrow keys, select a menu entry with the Return key or cancel with
-the Escape key.  If FRAME has no menu bar, this function does nothing.
+one or two Escape keypresses.  (Two Escape keypresses are needed when a
+menu was already dropped down by pressing Return.)
+
+If FRAME has no menu bar, this function does nothing.
 
 If FRAME is nil or not given, use the selected frame.
 If FRAME does not have the menu bar enabled, display a text menu using