changeset 19419:b03d1adefe72

(fill-individual-paragraphs): Fix handling of adaptive-fill. Call fill-context-prefix, but bind adaptive-fill-first-line-regexp to a null string.
author Richard M. Stallman <rms@gnu.org>
date Mon, 18 Aug 1997 20:08:38 +0000
parents 142900099257
children 681823a203b6
files lisp/textmodes/fill.el
diffstat 1 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/textmodes/fill.el	Mon Aug 18 20:01:25 1997 +0000
+++ b/lisp/textmodes/fill.el	Mon Aug 18 20:08:38 1997 +0000
@@ -951,13 +951,14 @@
 		   (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)