Documentation updates.

5 files changed, 47 insertions, 18 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index f356d35f1c5..abe173d31cc 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,13 @@
+2013-10-02  Eli Zaretskii  <eliz@gnu.org>
+
+        * screen.texi (Menu Bar): Adapt to TTY menus.
+
+        * frames.texi (Frames): Mention menu support on text terminals.
+
+        * files.texi (Visiting): Mention the "File" menu-bar menu.
+
+        * display.texi (Standard Faces): Mention TTY faces for menus.
+
 2013-09-26  Xue Fuqiao  <xfq.free@gmail.com>
 
         * dired.texi (Flagging Many Files): Use @emph instead of @strong.
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index aa9977a52e5..9327e7c8076 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -710,6 +710,17 @@ This face determines the color of tool bar icons.  @xref{Tool Bars}.
 @cindex customization of @code{menu} face
 This face determines the colors and font of Emacs's menus.  @xref{Menu
 Bars}.
+@item tty-menu-enabled-face
+@cindex faces for text-mode menus
+@cindex TTY menu faces
+This face is used to display enabled menu items on text-mode
+terminals.
+@item tty-menu-disabled-face
+This face is used to display disabled menu items on text-mode
+terminals.
+@item tty-menu-selected-face
+This face is used to display on text-mode terminals the menu item that
+would be selected if you click a mouse or press @key{RET}.
 @end table
 
 @node Text Scale
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index bff0926f347..1ebe4caa290 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -286,6 +286,10 @@ exception, dropping a file into a window displaying a Dired buffer
 moves or copies the file into the displayed directory.  For details,
 see @ref{Drag and Drop}, and @ref{Misc Dired Features}.
 
+  On text-mode terminals and on graphical displays when Emacs was
+built without a GUI toolkit, you can visit files via the menu-bar
+``File'' menu, which has a ``Visit New File'' item.
+
   Each time you visit a file, Emacs automatically scans its contents
 to detect what character encoding and end-of-line convention it uses,
 and converts these to Emacs's internal encoding and end-of-line
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index 5365bdc6e03..45f137d3b78 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -39,7 +39,7 @@ doing so on GNU and Unix systems; and
 @ifnottex
 @pxref{MS-DOS Mouse},
 @end ifnottex
-for doing so on MS-DOS).
+for doing so on MS-DOS).  Menus are supported on all text terminals.
 
 @menu
 * Mouse Commands::      Moving, cutting, and pasting, with the mouse.
diff --git a/doc/emacs/screen.texi b/doc/emacs/screen.texi
index 39077921a88..3306680f525 100644
--- a/doc/emacs/screen.texi
+++ b/doc/emacs/screen.texi
@@ -287,13 +287,12 @@ here, as you can more easily see them yourself.
 
 @kindex M-`
 @kindex F10
-@findex tmm-menubar
 @findex menu-bar-open
-  On a graphical display, you can use the mouse to choose a command
-from the menu bar.  An arrow on the right edge of a menu item means it
-leads to a subsidiary menu, or @dfn{submenu}.  A @samp{...} at the end
-of a menu item means that the command will prompt you for further
-input before it actually does anything.
+  On a display that support a mouse, you can use the mouse to choose a
+command from the menu bar.  An arrow on the right edge of a menu item
+means it leads to a subsidiary menu, or @dfn{submenu}.  A @samp{...}
+at the end of a menu item means that the command will prompt you for
+further input before it actually does anything.
 
   Some of the commands in the menu bar have ordinary key bindings as
 well; if so, a key binding is shown in parentheses after the item
@@ -305,14 +304,19 @@ 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
-@key{ESC}.
-
-  On a text terminal, you can use the menu bar by typing @kbd{M-`} or
-@key{F10} (these run the command @code{tmm-menubar}).  This lets you
-select a menu item with the keyboard.  A provisional choice appears in
-the echo area.  You can use the up and down arrow keys to move through
-the menu to different items, and then you can type @key{RET} to select
-the item.  Each menu item is also designated by a letter or digit
-(usually the initial of some word in the item's name).  This letter or
-digit is separated from the item name by @samp{==>}.  You can type the
-item's letter or digit to select the item.
+@kbd{C-g} or @kbd{ESC ESC ESC}.
+
+@findex tmm-menubar
+@vindex tty-menu-open-use-tmm
+  On a text terminal, you can optionally access the menu-bar menus in
+the echo area.  To this end, customize the variable
+@code{tty-menu-open-use-tmm} to a non-@code{nil} value.  Then typing
+@kbd{M-`} or @key{F10} will run the command @code{tmm-menubar} instead
+of dropping down the menu.  This lets you select a menu item with the
+keyboard.  A provisional choice appears in the echo area.  You can use
+the up and down arrow keys to move through the menu to different
+items, and then you can type @key{RET} to select the item.  Each menu
+item is also designated by a letter or digit (usually the initial of
+some word in the item's name).  This letter or digit is separated from
+the item name by @samp{==>}.  You can type the item's letter or digit
+to select the item.