(fill-region): Doc fix.

2 files changed, 13 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 17145837a6e..f24de58fbb7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-10  Juanma Barranquero  <lekktu@gmail.com>
+
+        * ediff-init.el (ediff-autostore-merges):
+        * textmodes/fill.el (fill-region): Doc fix.
+
 2007-01-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * server.el (server-ensure-safe-dir): UIDs may be floats.
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 94f29043d5d..65c8067d48a 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -743,7 +743,7 @@ space does not end a sentence, so don't break a line there."
 
 (defun fill-minibuffer-function (arg)
   "Fill a paragraph in the minibuffer, ignoring the prompt."
-  (save-restriction 
+  (save-restriction
     (narrow-to-region (minibuffer-prompt-end) (point-max))
     (fill-paragraph arg)))
 
@@ -840,7 +840,7 @@ can take care of filling.  JUSTIFY is used as in `fill-paragraph'."
              (comment-re
               ;; A regexp more specialized than comment-start-skip, that only
               ;; matches the current commark rather than any valid commark.
-              ;; 
+              ;;
               ;; The specialized regexp only works for "normal" comment
               ;; syntax, not for Texinfo's "@c" (which can't be immediately
               ;; followed by word-chars) or Fortran's "C" (which needs to be
@@ -948,13 +948,13 @@ Ordinarily the variable `fill-column' controls the width.
 
 Noninteractively, the third argument JUSTIFY specifies which
 kind of justification to do: `full', `left', `right', `center',
-or `none' (equivalent to nil).  t means handle each paragraph
-as specified by its text properties.
+or `none' (equivalent to nil).  A value of t means handle each
+paragraph as specified by its text properties.
 
-The fourth arg NOSQUEEZE non-nil means to leave
-whitespace other than line breaks untouched, and fifth arg TO-EOP
-non-nil means to keep filling to the end of the paragraph (or next
-hard newline, if variable `use-hard-newlines' is on).
+The fourth arg NOSQUEEZE non-nil means to leave whitespace other
+than line breaks untouched, and fifth arg TO-EOP non-nil means
+to keep filling to the end of the paragraph (or next hard newline,
+if variable `use-hard-newlines' is on).
 
 Return the fill-prefix used for filling the last paragraph.