diff options
| author | Richard M. Stallman | 1997-08-18 20:08:38 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1997-08-18 20:08:38 +0000 |
| commit | b4d413d983883184978703a7ce6407ba7513fac7 (patch) | |
| tree | 0ae593300ee9396e83ab1f13edb139d8f5a60eb0 /lisp | |
| parent | ab1c7f352775e81baaa9137e87dca9afef6257f0 (diff) | |
| download | emacs-b4d413d983883184978703a7ce6407ba7513fac7.tar.gz emacs-b4d413d983883184978703a7ce6407ba7513fac7.zip | |
(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')
| -rw-r--r-- | lisp/textmodes/fill.el | 15 |
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." | |||
| 951 | (if (not (and fill-prefix | 951 | (if (not (and fill-prefix |
| 952 | (looking-at fill-prefix-regexp))) | 952 | (looking-at fill-prefix-regexp))) |
| 953 | (setq fill-prefix | 953 | (setq fill-prefix |
| 954 | (if (and adaptive-fill-mode adaptive-fill-regexp | 954 | (or (let ((adaptive-fill-first-line-regexp "")) |
| 955 | (looking-at adaptive-fill-regexp)) | 955 | (fill-context-prefix |
| 956 | (match-string 0) | 956 | (point) |
| 957 | (buffer-substring | 957 | (save-excursion (forward-line 2) (point)))) |
| 958 | (point) | 958 | (buffer-substring |
| 959 | (save-excursion (skip-chars-forward " \t") | 959 | (point) |
| 960 | (point)))) | 960 | (save-excursion (skip-chars-forward " \t") |
| 961 | (point)))) | ||
| 961 | fill-prefix-regexp (regexp-quote fill-prefix))) | 962 | fill-prefix-regexp (regexp-quote fill-prefix))) |
| 962 | (forward-line 1) | 963 | (forward-line 1) |
| 963 | (if (bolp) | 964 | (if (bolp) |