summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/textmodes/fill.el7
2 files changed, 14 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1c86eb505f4..9fe1386cb44 100644
--- 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 a888003402d..dfd471a87c4 100644
--- 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