summaryrefslogtreecommitdiff
path: root/lisp/textmodes
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1997-08-18 20:08:38 +0000
committerRichard M. Stallman <rms@gnu.org>1997-08-18 20:08:38 +0000
commitce1892548a154738efd71447bcf150e816eba83d (patch)
tree53929fab5794848ff3083d7e539c90d201e2e690 /lisp/textmodes
parentfdd73e8d647e01c75889dd69627b19219328374a (diff)
downloademacs-ce1892548a154738efd71447bcf150e816eba83d.tar.gz
(fill-individual-paragraphs): Fix handling
of adaptive-fill. Call fill-context-prefix, but bind adaptive-fill-first-line-regexp to a null string.
Diffstat (limited to 'lisp/textmodes')
-rw-r--r--lisp/textmodes/fill.el15
1 files changed, 8 insertions, 7 deletions
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index a7431356fda..e7fb73f8285 100644
--- 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)