Merge from emacs-23; up to 2010-06-11T14:39:54Z!cyd@stupidchicken.com.

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

diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi
index fa9cadc..6aa8a06 100644 (file)
--- a/doc/emacs/windows.texi
+++ b/doc/emacs/windows.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2011
+@c   Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Windows, Frames, Buffers, Top
 @chapter Multiple Windows
@@ -107,12 +107,20 @@ scroll bar, the mode line of the split window is side by side with
 your click.
 
 @vindex truncate-partial-width-windows
-  When a window is less than the full width, text lines too long to
-fit are frequent.  Continuing all those lines might be confusing, so
-if the variable @code{truncate-partial-width-windows} is
-non-@code{nil}, that forces truncation in all windows less than the
-full width of the screen, independent of the buffer being displayed
-and its value for @code{truncate-lines}.  @xref{Line Truncation}.
+  When a window occupies less than the full width of the frame, it may
+become too narrow for most of the text lines in its buffer.  If most of
+its lines are continued (@pxref{Continuation Lines}), the buffer may
+become difficult to read.  Therefore, Emacs automatically truncates
+lines if the window width becomes narrower than 50 columns.  This
+truncation occurs regardless of the value of the variable
+@code{truncate-lines} (@pxref{Line Truncation}); it is instead
+controlled by the variable @code{truncate-partial-width-windows}.  If
+the value of @code{truncate-partial-width-windows} is a positive integer
+(the default is 50), that specifies the minimum width for a
+partial-width window before automatic line truncation occurs; if the
+value is @code{nil}, automatic line truncation is disabled; and for any
+other non-@code{nil} value, Emacs truncates lines in every partial-width
+window regardless of its width.
 
   Horizontal scrolling is often used in side-by-side windows.
 @xref{Horizontal Scrolling}.
@@ -216,6 +224,14 @@ window.  This runs @code{find-file-read-only-other-window}.
 @xref{Visiting}.
 @end table
 
+@vindex split-height-threshold
+@vindex split-width-threshold
+  By default, these commands split the window vertically when there is
+only one.  You can customize the variables @code{split-height-threshold}
+and @code{split-width-threshold} to split the window horizontally
+instead.
+
+
 @node Force Same Window
 @section Forcing Display in the Same Window
 
@@ -327,10 +343,10 @@ to an adjacent window.  The minimum size is specified by the variables
 
 @kindex C-x -
 @findex shrink-window-if-larger-than-buffer
-  The command @kbd{C-x -} (@code{shrink-window-if-larger-than-buffer})
-reduces the height of the selected window, if it is taller than
-necessary to show the whole text of the buffer it is displaying.  It
-gives the extra lines to other windows in the frame.
+  @kbd{C-x -} (@code{shrink-window-if-larger-than-buffer}) reduces the
+height of the selected window, if it is taller than necessary to show
+the whole text of the buffer it is displaying.  It gives the extra
+lines to other windows in the frame.
 
 @kindex C-x +
 @findex balance-windows
@@ -381,7 +397,3 @@ windows together.  You can also turn it on by customizing the variable
 scroll-all-scroll-down-all}, @kbd{M-x scroll-all-page-down-all} and
 their corresponding ``up'' equivalents.  To make this mode useful,
 you should bind these commands to appropriate keys.
-
-@ignore
-   arch-tag: 8bea7453-d4b1-49b1-9bf4-cfe4383e1113
-@end ignore