From a02a3c235e3ec24acaf2014e6c60c0b4138ff86f Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Thu, 24 May 2007 20:18:14 +0000 Subject: [PATCH] Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 222-223) - Update from CVS 2007-05-24 Katsumi Yamaoka * lisp/gnus/message.el (message-narrow-to-headers-or-head): Ignore mail-header-separator in the body. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-768 --- lisp/gnus/ChangeLog | 5 +++++ lisp/gnus/message.el | 14 ++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index e605ed51193..9f4df39957f 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2007-05-24 Katsumi Yamaoka + + * message.el (message-narrow-to-headers-or-head): Ignore + mail-header-separator in the body. + 2007-05-10 Reiner Steib * gnus-art.el (gnus-article-mode): Fix comment about displaying diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index baf98611308..432bd69b67f 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -2225,14 +2225,12 @@ Point is left at the beginning of the narrowed-to region." (widen) (narrow-to-region (goto-char (point-min)) - (cond - ((re-search-forward - (concat "^" (regexp-quote mail-header-separator) "\n") nil t) - (match-beginning 0)) - ((search-forward "\n\n" nil t) - (1- (point))) - (t - (point-max)))) + (if (re-search-forward (concat "\\(\n\\)\n\\|^\\(" + (regexp-quote mail-header-separator) + "\n\\)") + nil t) + (or (match-end 1) (match-beginning 2)) + (point-max))) (goto-char (point-min))) (defun message-news-p () -- 2.39.2