Merge from emacs-23; up to 2010-06-09T17:54:28Z!albinus@detlef.

6 files changed, 30 insertions, 12 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index c6405019ddb..37825382788 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-23  Juanma Barranquero  <lekktu@gmail.com>
+
+	* mini.texi (Minibuffer Edit):
+	* screen.texi (Mode Line): Fix typo.
+
 2011-04-20  Christoph Scholtes  <cschol2112@googlemail.com>
 
 	* maintaining.texi (Old Revisions): Mention new function vc-ediff.
diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi
index 20086bd5e4a..dcc1c445e68 100644
--- a/doc/emacs/mini.texi
+++ b/doc/emacs/mini.texi
@@ -164,7 +164,7 @@ however: for instance, you cannot split it.  @xref{Windows}.
 @vindex resize-mini-windows
   Normally, the minibuffer window occupies a single screen line.
 However, if you add two or more lines' worth of text into the
-minibuffer, it expands automatically to accomodate the text.  The
+minibuffer, it expands automatically to accommodate the text.  The
 variable @code{resize-mini-windows} controls the resizing of the
 minibuffer.  The default value is @code{grow-only}, which means the
 behavior we have just described.  If the value is @code{t}, the
diff --git a/doc/emacs/screen.texi b/doc/emacs/screen.texi
index 45cbdac4b44..0bc3ce3db8c 100644
--- a/doc/emacs/screen.texi
+++ b/doc/emacs/screen.texi
@@ -259,7 +259,7 @@ the buffer.  Minor modes are optional editing modes that provide
 additional features on top of the major mode.  @xref{Minor Modes}.
 
   Some features are listed together with the minor modes whenever they
-are turned on, even through they are not really minor modes.
+are turned on, even though they are not really minor modes.
 @samp{Narrow} means that the buffer being displayed has editing
 restricted to only a portion of its text (@pxref{Narrowing}).
 @samp{Def} means that a keyboard macro is currently being defined
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 784f62dc4cc..0c0583c06ab 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,13 @@
+2011-04-23  Juanma Barranquero  <lekktu@gmail.com>
+
+	* windows.texi (Choosing Window): Fix typo.
+
+2011-04-23  Chong Yidong  <cyd@stupidchicken.com>
+
+	* frames.texi (Layout Parameters): Note the difference between
+	querying and setting parameters for left-fringe and right-fringe
+	(Bug#6930).
+
 2011-03-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* minibuf.texi (Basic Completion): Be a bit more precise about the
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index 92969d8259c..06c120cc09d 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -681,17 +681,20 @@ use the default width.
 @itemx right-fringe
 The default width of the left and right fringes of windows in this
 frame (@pxref{Fringes}).  If either of these is zero, that effectively
-removes the corresponding fringe.  A value of @code{nil} stands for
-the standard fringe width, which is the width needed to display the
-fringe bitmaps.
+removes the corresponding fringe.
+
+When you use @code{frame-parameter} to query the value of either of
+these two frame parameters, the return value is always an integer.
+When using @code{set-frame-parameter}, passing a @code{nil} value
+imposes an actual default value of 8 pixels.
 
 The combined fringe widths must add up to an integral number of
-columns, so the actual default fringe widths for the frame may be
-larger than the specified values.  The extra width needed to reach an
-acceptable total is distributed evenly between the left and right
-fringe.  However, you can force one fringe or the other to a precise
-width by specifying that width as a negative integer.  If both widths are
-negative, only the left fringe gets the specified width.
+columns, so the actual default fringe widths for the frame, as
+reported by @code{frame-parameter}, may be larger than what you
+specify.  Any extra width is distributed evenly between the left and
+right fringe.  However, you can force one fringe or the other to a
+precise width by specifying that width as a negative integer.  If both
+widths are negative, only the left fringe gets the specified width.
 
 @vindex menu-bar-lines, a frame parameter
 @item menu-bar-lines
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 528930c0ff6..9ce00de4abc 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -1014,7 +1014,7 @@ a window only if the space taken up by that window can accommodate two
 windows one above the other that are both at least
 @code{window-min-height} lines tall.  Moreover, if the window that shall
 be split has a mode line, @code{split-window-sensibly} does not split
-the window unless the new window can accomodate a mode line too.
+the window unless the new window can accommodate a mode line too.
 @end defopt
 
 @defopt split-width-threshold