(fill-individual-paragraphs): Don't include

paragraph-separate lines in any paragraph; just skip them.

1 files changed, 7 insertions, 1 deletions

diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index e7fb73f8285..5fd50ecc521 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -939,7 +939,13 @@ MAIL-FLAG for a mail message, i. e. don't fill header lines."
               (forward-line 1))))
       (narrow-to-region (point) max)
       ;; Loop over paragraphs.
-      (while (progn (skip-chars-forward " \t\n") (not (eobp)))
+      (while (progn
+               ;; Skip over all paragraph-separating lines
+               ;; so as to not include them in any paragraph.
+               (while (progn (move-to-left-margin)
+                             (and (not (eobp)) (looking-at paragraph-separate)))
+                 (forward-line 1))
+               (skip-chars-forward " \t\n") (not (eobp)))
         (move-to-left-margin)
         (let ((start (point))
               fill-prefix fill-prefix-regexp)