(fill-individual-paragraphs): Fix handling

of adaptive-fill.  Call fill-context-prefix, but bind
adaptive-fill-first-line-regexp to a null string.

diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index a7431356fda8ee77ae1ea6cced3c9bcfb4a1596f..e7fb73f8285a8436fddf80aa4830596c1354354e 100644 (file)
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -951,13 +951,14 @@ MAIL-FLAG for a mail message, i. e. don't fill header lines."
                   (if (not (and fill-prefix
                                 (looking-at fill-prefix-regexp)))
                       (setq fill-prefix
-                            (if (and adaptive-fill-mode adaptive-fill-regexp
-                                     (looking-at adaptive-fill-regexp))
-                                (match-string 0)
-                              (buffer-substring 
-                               (point)
-                               (save-excursion (skip-chars-forward " \t")
-                                               (point))))
+                            (or (let ((adaptive-fill-first-line-regexp ""))
+                                  (fill-context-prefix
+                                   (point)
+                                   (save-excursion (forward-line 2) (point))))
+                                (buffer-substring 
+                                 (point)
+                                 (save-excursion (skip-chars-forward " \t")
+                                                 (point))))
                             fill-prefix-regexp (regexp-quote fill-prefix)))
                   (forward-line 1)
                   (if (bolp)