From: Richard M. Stallman Date: Fri, 6 Feb 1998 06:57:40 +0000 (+0000) Subject: (rmail-clear-headers): Handle the last header in a message correctly. X-Git-Tag: emacs-20.3~2220 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9d21b6279fa5c5687b852121264e90d4267e950f;p=emacs.git (rmail-clear-headers): Handle the last header in a message correctly. --- diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index febdd3ce587..0371837b6a2 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -1636,16 +1636,18 @@ Otherwise, delete all header fields whose names match `rmail-ignored-headers'." (if (and rmail-displayed-headers (null ignored-headers)) (save-restriction (narrow-to-region (point-min) (point)) - (let (lim) + (let (lim next) (goto-char (point-min)) - (while (save-excursion - (re-search-forward "\n[^ \t]") - (and (not (eobp)) - (setq lim (1- (point))))) + (while (and (not (eobp)) + (save-excursion + (if (re-search-forward "\n[^ \t]" nil t) + (setq lim (match-beginning 0) + next (1+ lim)) + (setq lim nil next (point-max))))) (if (save-excursion (re-search-forward rmail-displayed-headers lim t)) - (goto-char lim) - (delete-region (point) lim)))) + (goto-char next) + (delete-region (point) next)))) (goto-char (point-min))) (or ignored-headers (setq ignored-headers rmail-ignored-headers)) (save-restriction