Some doc for desktop-auto-save-timeout

[bpt/emacs.git] / doc / emacs / display.texi

diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index aa9977a..d9fd819 100644 (file)
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -1,5 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software
+@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2014 Free Software
 @c Foundation, Inc.
 
 @c See file emacs.texi for copying conditions.
@@ -428,8 +428,8 @@ it.  @xref{Disabling}.
 screenfuls.  It provides commands for scrolling through the buffer
 conveniently but not for changing it.  Apart from the usual Emacs
 cursor motion commands, you can type @key{SPC} to scroll forward one
-windowful, @key{DEL} to scroll backward, and @kbd{s} to start an
-incremental search.
+windowful, @key{S-SPC} or @key{DEL} to scroll backward, and @kbd{s} to
+start an incremental search.
 
 @kindex q @r{(View mode)}
 @kindex e @r{(View mode)}
@@ -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
@@ -732,9 +743,9 @@ determine which action to take.
 @kbd{C-x}.  For instance, @kbd{C-x C-= C-= C-=} increases the face
 height by three steps.  Each step scales the text height by a factor
 of 1.2; to change this factor, customize the variable
-@code{text-scale-mode-step}.  As an exception, a numeric argument of 0
+@code{text-scale-mode-step}.  A numeric argument of 0
 to the @code{text-scale-adjust} command restores the default height,
-similar to typing @kbd{C-x C-0}.
+the same as typing @kbd{C-x C-0}.
 
 @cindex increase buffer face height
 @findex text-scale-increase
@@ -1314,7 +1325,7 @@ specify the mail file to check, or set
 for incoming mail (any nonempty regular file in the directory is
 considered as ``newly arrived mail'').
 
-@cindex mail (on mode line)
+@cindex battery status (on mode line)
 @findex display-battery-mode
 @vindex display-battery-mode
 @vindex battery-mode-line-format
@@ -1462,8 +1473,12 @@ pixels tall), or @code{nil} (no cursor at all).
 @findex blink-cursor-mode
 @cindex cursor, blinking
 @cindex blinking cursor
+@vindex blink-cursor-mode
+@vindex blink-cursor-blinks
 @vindex blink-cursor-alist
-  To disable cursor blinking, change the variable
+  By default, the cursor stops blinking after 10 blinks.  This can be
+changed by customizing the variable @code{blink-cursor-blinks}.  To
+disable cursor blinking altogether, change the variable
 @code{blink-cursor-mode} to @code{nil} (@pxref{Easy Customization}),
 or add the line @code{(blink-cursor-mode 0)} to your init file.
 Alternatively, you can change how the cursor looks when it ``blinks