(fill-comment-paragraph): Handle indent-tabs-mode.

(fill-delete-newlines): Call sentence-end as function.
(fill-nobreak-p, canonically-space-region): Likewise.
(fill-nobreak-p): If this break point is at the end of the line,
don't consider the newline which follows as a reason to return t.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1c86eb505f40f381c296b4b1ff45f7797c52c44c..9fe1386cb4495ff84c645f847b38758f16875938 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2004-07-20  Richard M. Stallman  <rms@gnu.org>
+
+       * textmodes/fill.el (fill-comment-paragraph): Handle indent-tabs-mode.
+       (fill-delete-newlines): Call sentence-end as function.
+       (fill-nobreak-p, canonically-space-region): Likewise.
+       (fill-nobreak-p): If this break point is at the end of the line,
+       don't consider the newline which follows as a reason to return t.
+
 2004-07-19  John Paul Wallington  <jpw@gnu.org>
 
        * dired-aux.el (dired-file-set-difference): Don't use `caddr'.

diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index a888003402d7ad9a9b5e87171882b4fd788a5929..dfd471a87c4f96edaad814b00a28410bd1731ecd 100644 (file)
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -353,7 +353,12 @@ and `fill-nobreak-invisible'."
      ;; Don't split a line if the rest would look like a new paragraph.
      (unless use-hard-newlines
        (save-excursion
-        (skip-chars-forward " \t") (looking-at paragraph-start)))
+        (skip-chars-forward " \t")
+        ;; If this break point is at the end of the line,
+        ;; which can occur for auto-fill, don't consider the newline
+        ;; which follows as a reason to return t.
+        (and (not (eolp))
+             (looking-at paragraph-start))))
      (run-hook-with-args-until-success 'fill-nobreak-predicate)))))
 
 ;; Put `fill-find-break-point-function' property to charsets which