Lessen focus on ChangeLog files, as opposed to change log entries.

[gnu-emacs] / doc / emacs / screen.texi

diff --git a/doc/emacs/screen.texi b/doc/emacs/screen.texi
index 989cf998bfd1112f34b676143ef222b59332d6e8..3c254268ed266ed8da16c06824d769c14eb3621d 100644 (file)
--- a/doc/emacs/screen.texi
+++ b/doc/emacs/screen.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c This is part of the Emacs manual.

-@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2012
-@c   Free Software Foundation, Inc.
+@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2014 Free Software
+@c Foundation, Inc.

 @c See file emacs.texi for copying conditions.
 @node Screen
 @chapter The Organization of the Screen
 @c See file emacs.texi for copying conditions.
 @node Screen
 @chapter The Organization of the Screen


@@ -123,7 +123,7 @@ beeping or by flashing the screen.
 you what the command has done, or to provide you with some specific
 information.  These @dfn{informative} messages, unlike error messages,
 are not accompanied with a beep or flash.  For example, @kbd{C-x =}
 you what the command has done, or to provide you with some specific
 information.  These @dfn{informative} messages, unlike error messages,
 are not accompanied with a beep or flash.  For example, @kbd{C-x =}

-(hold down @key{CTRL} and type @kbd{x}, then let go of @key{CTRL} and
+(hold down @key{Ctrl} and type @kbd{x}, then let go of @key{Ctrl} and

 type @kbd{=}) displays a message describing the character at point,
 its position in the buffer, and its current column in the window.
 Commands that take a long time often display messages ending in
 type @kbd{=}) displays a message describing the character at point,
 its position in the buffer, and its current column in the window.
 Commands that take a long time often display messages ending in


@@ -285,15 +285,11 @@ performs various commands.  @xref{Mode Line Mouse}.
 can use to perform common operations.  There's no need to list them
 here, as you can more easily see them yourself.
 
 can use to perform common operations.  There's no need to list them
 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 supports 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
 
   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


@@ -301,18 +297,28 @@ itself.  To view the full command name and documentation for a menu
 item, type @kbd{C-h k}, and then select the menu bar with the mouse in
 the usual way (@pxref{Key Help}).
 
 item, type @kbd{C-h k}, and then select the menu bar with the mouse in
 the usual way (@pxref{Key Help}).
 

+@kindex F10
+@findex menu-bar-open
+@cindex menu bar access using keyboard

   Instead of using the mouse, you can also invoke the first menu bar
 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
   Instead of using the mouse, you can also invoke the first menu bar
 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{@key{ESC} @key{ESC} @key{ESC}}.
+
+@kindex M-`
+@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
+@key{F10} will run the command @code{tmm-menubar} instead of dropping
+down the menu.  (You can also type @kbd{M-`}, which always invokes
+@code{tmm-menubar}.)  @code{tmm-menubar} 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.