Remove unnecessary prev/next/up pointers in @node

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

diff --git a/man/display.texi b/man/display.texi
index aa9678a..3bc6807 100644 (file)
--- a/man/display.texi
+++ b/man/display.texi
@@ -100,12 +100,20 @@ faces:
 @item default
 This face is used for ordinary text that doesn't specify any other face.
 @item mode-line
-This face is used for mode lines.  By default, it's drawn with shadows
-for a ``raised'' effect on window systems, and drawn as the inverse of
-the default face on non-windowed terminals.  @xref{Display Custom}.
+This face is used for the mode line of the currently selected window.
+By default, it's drawn with shadows for a ``raised'' effect on window
+systems, and drawn as the inverse of the default face on non-windowed
+terminals.  @xref{Display Custom}.
+@item mode-line-inactive
+Like @code{mode-line}, but used for mode lines of the windows other
+than the selected one (if @code{mode-line-in-non-selected-windows} is
+non-@code{nil}).  This face inherits from @code{mode-line}, so changes
+in that face affect mode lines in all windows.
 @item header-line
 Similar to @code{mode-line} for a window's header line.  Most modes
 don't use the header line, but the Info mode does.
+@item minibuffer-prompt
+This face is used for the prompt strings displayed in the minibuffer.
 @item highlight
 This face is used for highlighting portions of text, in various modes.
 For example, mouse-sensitive text is highlighted using this face.
@@ -632,9 +640,24 @@ for automatic horizontal scrolling.  Automatic scrolling will continue
 to scroll the window, but never farther to the right than the amount
 you previously set by @code{scroll-left}.
 
-@vindex automatic-hscrolling
+@vindex hscroll-margin
+  The value of the variable @code{hscroll-margin} controls how close
+to the window's edges point is allowed to get before the window will
+be automatically scrolled.  It is measured in columns.  If the value
+is 5, then moving point within 5 columns of the edge causes horizontal
+scrolling away from that edge.
+
+@vindex hscroll-step
+  The variable @code{hscroll-step} determines how many columns to
+scroll the window when point gets too close to the edge.  If it's
+zero, horizontal scrolling centers point horizontally within the
+window.  If it's a positive integer, it specifies the number of
+columns to scroll by.  If it's a floating-point number, it specifies
+the fraction of the window's width to scroll by.  The default is zero.
+
+@vindex auto-hscroll-mode
   To disable automatic horizontal scrolling, set the variable
-@code{automatic-hscrolling} to @code{nil}.
+@code{auto-hscroll-mode} to @code{nil}.
 
 @node Follow Mode
 @section Follow Mode
@@ -782,6 +805,20 @@ Alternatively, you can turn off the box attribute in your
 Emacs.mode-line.AttributeBox: off
 @end example
 
+@cindex non-selected windows, mode line appearance
+  By default, the mode line of nonselected windows is displayed in a
+different face, called @code{mode-line-inactive}.  Only the selected
+window is displayed in the @code{mode-line} face.  This helps show
+which window is selected.  When the minibuffer is selected, since
+it has no mode line, the window from which you activated the minibuffer
+has its mode line displayed using @code{mode-line}; as a result,
+ordinary entry to the minibuffer does not change any mode lines.
+
+@vindex mode-line-in-non-selected-windows
+  You can disable use of @code{mode-line-inactive} by setting variable
+@code{mode-line-in-non-selected-windows} to @code{nil}; then all mode
+lines are displayed in the @code{mode-line} face.
+
 @node Text Display
 @section How Text Is Displayed
 @cindex characters (in text)