From 6bd7660d5dc9be6bea9c45f07bfe1659e9ca3a79 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Mon, 30 Dec 2002 17:24:47 +0000 Subject: [PATCH] (fill-flowed): Don't infloop on too long fill prefixes. --- lisp/ChangeLog | 3 +++ lisp/flow-fill.el | 13 +++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9c9055071..17e08000c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2002-12-30 Lars Magne Ingebrigtsen + * flow-fill.el (fill-flowed): Don't infloop on too long fill + prefixes. + * dns.el (query-dns): Protect against errors. * gnus-msg.el (gnus-article-yanked-articles): New variable. diff --git a/lisp/flow-fill.el b/lisp/flow-fill.el index 2d1dd91b2..dcdd47579 100644 --- a/lisp/flow-fill.el +++ b/lisp/flow-fill.el @@ -109,7 +109,8 @@ RFC 2646 suggests 66 characters for readability." (when (save-excursion (beginning-of-line) (looking-at "^\\(>*\\)\\( ?\\)")) - (let ((quote (match-string 1)) sig) + (let ((quote (match-string 1)) + sig) (if (string= quote "") (setq quote nil)) (when (and quote (string= (match-string 2) "")) @@ -126,7 +127,8 @@ RFC 2646 suggests 66 characters for readability." (save-excursion (unless (eobp) (forward-char 1) - (looking-at (format "^\\(%s\\)\\([^>]\\)" (or quote " ?")))))) + (looking-at (format "^\\(%s\\)\\([^>]\\)" + (or quote " ?")))))) (save-excursion (replace-match (if (string= (match-string 2) " ") "" "\\2"))) @@ -138,9 +140,12 @@ RFC 2646 suggests 66 characters for readability." (fill-column (eval fill-flowed-display-column)) filladapt-mode) (fill-region (fill-flowed-point-at-bol) - (min (1+ (fill-flowed-point-at-eol)) (point-max)) + (min (1+ (fill-flowed-point-at-eol)) + (point-max)) 'left 'nosqueeze)) - (error nil)))))))) + (error + (forward-line 1) + nil)))))))) (provide 'flow-fill) -- 2.34.1