(fill-individual-paragraphs): Calculate new

fill prefix on each line while looping to the end of paragraph.
End paragraph if it's longer than the existing fill prefix.

diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index e79b5588a9100e87c3dc264c20af2503d17ecde8..129fd42986a97c99fbb69dd823540ecb7e76edb0 100644 (file)
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -1127,6 +1127,13 @@ Also, if CITATION-REGEXP is non-nil,  don't fill header lines."
                          ;; If this line has more or less indent
                          ;; than the fill prefix wants, end the paragraph.
                          (and (looking-at fill-prefix-regexp)
+                              ;; If fill prefix is shorter than a new
+                              ;; fill prefix computed here, end paragraph.
+                              (let ((this-line-fill-prefix
+                                     (fill-individual-paragraphs-prefix 
+                                      citation-regexp)))
+                                (>= (length fill-prefix) 
+                                    (length this-line-fill-prefix)))
                               (save-excursion
                                 (not (progn (forward-char (length fill-prefix))
                                             (or (looking-at "[ \t]")