From 50df7214b3defc0705f2c776d5659c97925673ce Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Mon, 30 Apr 2001 12:57:34 +0000 Subject: [PATCH] (rmail-message-regexp-p): Yet another fix. --- lisp/ChangeLog | 4 ++++ lisp/mail/rmail.el | 13 ++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 12edb45ccef..94afe6c37bb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2001-04-30 Gerd Moellmann + + * mail/rmail.el (rmail-message-regexp-p): Yet another fix. + 2001-04-29 Eli Zaretskii * term/tty-colors.el (tty-color-define, tty-color-off-gray-diag) diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 5d5a1c494f2..62ad4f6b27f 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -2507,15 +2507,18 @@ or forward if N is negative." (forward-line 2) ;; If there's a Summary-line in the (otherwise empty) ;; header, we didn't yet get past the EOOH line. - (if (looking-at "^\\*\\*\\* EOOH \\*\\*\\*\n") - (forward-line 1)) + (when (looking-at "^\\*\\*\\* EOOH \\*\\*\\*\n") + (forward-line 1)) (setq beg (point)) (narrow-to-region (point) end)) - (rfc822-goto-eoh) + (progn + (rfc822-goto-eoh) + (setq end (point))) (setq beg (point)) - (search-forward "\n*** EOOH ***\n" end t)) + (search-forward "\n*** EOOH ***\n" end t) + (setq end (1+ (match-beginning 0))))) (goto-char beg) - (re-search-forward regexp end t))))) + (re-search-forward regexp end t)))) (defvar rmail-search-last-regexp nil) (defun rmail-search (regexp &optional n)