Mercurial > emacs
changeset 81061:a0c6ca9f4685
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 222-223)
- Update from CVS
2007-05-24 Katsumi Yamaoka <yamaoka@jpl.org>
* 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
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Thu, 24 May 2007 20:18:14 +0000 |
| parents | 911e49c71332 |
| children | f77f86268d5b 31beec9ee600 |
| files | lisp/gnus/ChangeLog lisp/gnus/message.el |
| diffstat | 2 files changed, 11 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Thu May 24 16:13:18 2007 +0000 +++ b/lisp/gnus/ChangeLog Thu May 24 20:18:14 2007 +0000 @@ -1,3 +1,8 @@ +2007-05-24 Katsumi Yamaoka <yamaoka@jpl.org> + + * message.el (message-narrow-to-headers-or-head): Ignore + mail-header-separator in the body. + 2007-05-10 Reiner Steib <Reiner.Steib@gmx.de> * gnus-art.el (gnus-article-mode): Fix comment about displaying
--- a/lisp/gnus/message.el Thu May 24 16:13:18 2007 +0000 +++ b/lisp/gnus/message.el Thu May 24 20:18:14 2007 +0000 @@ -2225,14 +2225,12 @@ (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 ()