diff options
| author | Ferdinand Pieper <git@pie.tf> | 2020-08-14 16:15:08 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2020-08-14 16:15:13 +0200 |
| commit | c6267c0fe61531501cb6ab56bdebb500bdf73c29 (patch) | |
| tree | e82a56ac4df087b9f87be191a6f329a8d94df0c8 /lisp/mail/flow-fill.el | |
| parent | 5d6a274c1fa1e1cb9c82a7b1bf4ff27a1f76fd66 (diff) | |
| download | emacs-c6267c0fe61531501cb6ab56bdebb500bdf73c29.tar.gz emacs-c6267c0fe61531501cb6ab56bdebb500bdf73c29.tar.bz2 emacs-c6267c0fe61531501cb6ab56bdebb500bdf73c29.zip | |
Fix flow filling for flowing multiple flowed lines
* lisp/mail/flow-fill.el (fill-flowed): Loop until all flowed lines
are collected.
* test/lisp/mail/flow-fill-tests.el
(fill-flow-tests-fill-flowed-decode): Also test for multiple
flowed lines (bug#42855).
Diffstat (limited to 'lisp/mail/flow-fill.el')
| -rw-r--r-- | lisp/mail/flow-fill.el | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/lisp/mail/flow-fill.el b/lisp/mail/flow-fill.el index af3b493a08a..f4b55031194 100644 --- a/lisp/mail/flow-fill.el +++ b/lisp/mail/flow-fill.el @@ -131,31 +131,37 @@ lines." (goto-char (match-end 0)) (unless (looking-at " ") (insert " ")) - (end-of-line) - (when (and (not (eobp)) - (save-excursion - (forward-line 1) - (looking-at (format "\\(%s ?\\)[^>]" prefix)))) - ;; Delete the newline and the quote at the start of the - ;; next line. - (delete-region (point) (match-end 1)) - (ignore-errors + (while (and (eq (char-before (line-end-position)) ?\s) + (not (eobp)) + (save-excursion + (forward-line 1) + (looking-at (format "\\(%s ?\\)[^>]" prefix)))) + (end-of-line) + (when (and (not (eobp)) + (save-excursion + (forward-line 1) + (looking-at (format "\\(%s ?\\)[^>]" prefix)))) + ;; Delete the newline and the quote at the start of the + ;; next line. + (delete-region (point) (match-end 1)))) + (ignore-errors (let ((fill-prefix (concat prefix " ")) adaptive-fill-mode) (fill-region (line-beginning-position) (line-end-position) - 'left 'nosqueeze)))))) - (t + 'left 'nosqueeze))))) + (t ;; Delete the newline. (when (eq (following-char) ?\s) (delete-char 1)) ;; Hack: Don't do the flowing on the signature line. (when (and (not (looking-at "-- $")) (eq (char-before (line-end-position)) ?\s)) - (end-of-line) - (when delete-space - (delete-char -1)) - (delete-char 1) + (while (eq (char-before (line-end-position)) ?\s) + (end-of-line) + (when delete-space + (delete-char -1)) + (delete-char 1)) (ignore-errors (let ((fill-prefix "")) (fill-region (line-beginning-position) |