Merge from emacs-23

4 files changed, 19 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9428bd4c0bc..706a6ae3aeb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-27  Christoph Scholtes  <cschol2112@gmail.com>
+
+        * minibuf.c (Fread_buffer): Doc fix (bug#6528).
+
+        * window.c (Fwindow_height): Doc fix (bug#6518).
+
+2010-07-27  Juanma Barranquero  <lekktu@gmail.com>
+
+        * buffer.c (syms_of_buffer) <fringe-indicator-alist>: Doc fix.
+
 2010-07-26  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * keyboard.c (Ftop_level, Fexit_recursive_edit)
diff --git a/src/buffer.c b/src/buffer.c
index ac39219e61e..a90262fc557 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5899,14 +5899,14 @@ fringe indicator.
 
 INDICATOR specifies the logical indicator type which is one of the
 following symbols: `truncation' , `continuation', `overlay-arrow',
-`top', `bottom', `up', `down', `one-line', `empty-line', or `unknown'.
+`top', `bottom', `top-bottom', `up', `down', empty-line', or `unknown'.
 
-BITMAPS is list of symbols (LEFT RIGHT [LEFT1 RIGHT1]) which specifies
+BITMAPS is a list of symbols (LEFT RIGHT [LEFT1 RIGHT1]) which specifies
 the actual bitmap shown in the left or right fringe for the logical
 indicator.  LEFT and RIGHT are the bitmaps shown in the left and/or
 right fringe for the specific indicator.  The LEFT1 or RIGHT1 bitmaps
-are used only for the `bottom' and `one-line' indicators when the last
-\(only) line in has no final newline.  BITMAPS may also be a single
+are used only for the `bottom' and `top-bottom' indicators when the
+last (only) line has no final newline.  BITMAPS may also be a single
 symbol which is used in both left and right fringes.  */);
 
   DEFVAR_PER_BUFFER ("fringe-cursor-alist",
diff --git a/src/minibuf.c b/src/minibuf.c
index 5dc7b0b1f06..01478c2d5bd 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1152,7 +1152,7 @@ Optional second arg DEF is value to return if user enters an empty line.
  If DEF is a list of default values, return its first element.
 Optional third arg REQUIRE-MATCH determines whether non-existing
  buffer names are allowed.  It has the same meaning as the
- REQUIRE-MATCH argument of `confirm-after-completion'.
+ REQUIRE-MATCH argument of `completing-read'.
 The argument PROMPT should be a string ending with a colon and a space.
 If `read-buffer-completion-ignore-case' is non-nil, completion ignores
 case while reading the buffer name.
diff --git a/src/window.c b/src/window.c
index 89563112628..662b587150d 100644
--- a/src/window.c
+++ b/src/window.c
@@ -508,7 +508,10 @@ DEFUN ("window-height", Fwindow_height, Swindow_height, 0, 1, 0,
        doc: /* Return the number of lines in WINDOW.
 WINDOW defaults to the selected window.
 
-The return value includes WINDOW's mode line and header line, if any.  */)
+The return value includes WINDOW's mode line and header line, if any.
+
+Note: The function does not take into account the value of `line-spacing'
+when calculating the number of lines in WINDOW.  */)
   (Lisp_Object window)
 {
   return decode_any_window (window)->total_lines;