From d3daa4fd611fab548f9cdc62af18f2e881be2cee Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 13 Feb 2003 12:20:28 +0000 Subject: [PATCH] Synch to Oort Gnus. --- ChangeLog | 5 ++++ GNUS-NEWS | 18 ++++++++++++++ lisp/ChangeLog | 6 +++++ lisp/gnus-art.el | 71 ++++++++++++++++++++++++++++++------------------------ lisp/message.el | 2 +- 5 files changed, 69 insertions(+), 33 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5ffeaae..04ea943 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-02-13 Kai Gro,A_(Bjohann + + * GNUS-NEWS: Add user visible changes from Michael Shields from + the past couple of days. Actual text from Michael. + 2003-02-09 Katsumi Yamaoka * lisp/gnus-vers.el: T-gnus 6.15.16 (quimby) revision 00. diff --git a/GNUS-NEWS b/GNUS-NEWS index dc49807..61ed6fe 100644 --- a/GNUS-NEWS +++ b/GNUS-NEWS @@ -8,6 +8,24 @@ For older news, see Gnus info node "New Features". * Changes in Oort Gnus +** Better handling of Microsoft citation styles + +Gnus now tries to recognize the mangled header block that some +Microsoft mailers use to indicate that the rest of the message is a +citation, even though it is not quoted in any way. The variable +`gnus-unsightly-citation-regexp' matches the start of these citations. + +** gnus-article-skip-boring + +If you set `gnus-article-skip-boring' to t, then Gnus will not scroll +down to show you a page that contains only boring text, which by +default means cited text and signature. You can customize what is +skippable using `gnus-article-boring-faces'. + +This feature is especially useful if you read many articles that +consist of a little new content at the top with a long, untrimmed +message cited below. + ** The format spec %C for positioning point has changed to %*. ** The new variable `gnus-parameters' can be used to set group parameters. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5c7b65b..189f65d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2003-02-13 Kai Gro,A_(Bjohann + + * message.el (message-unix-mail-delimiter): Accept any whitespace + after the email address and before the date; do not require the + space character. From Kurt B. Kaiser . + 2003-02-13 Katsumi Yamaoka * gnus-art.el (gnus-article-only-boring-p): Make sure that the diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 40cb604..510694a 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -2426,43 +2426,50 @@ always hide." (match-beginning 0) (match-end 0) 'pem))))))) (defun article-strip-banner () - "Strip the banner specified by the `banner' group parameter." + "Strip the banners specified by the `banner' group parameter and by +`gnus-article-address-banner-alist'." (interactive) (save-excursion (save-restriction + (let ((inhibit-point-motion-hooks t)) + (when (gnus-parameter-banner gnus-newsgroup-name) + (article-really-strip-banner + (gnus-parameter-banner gnus-newsgroup-name))) + (when gnus-article-address-banner-alist + (article-really-strip-banner + (let ((from (save-restriction + (widen) + (article-narrow-to-head) + (mail-fetch-field "from")))) + (when (and from + (setq from + (caar (mail-header-parse-addresses from)))) + (catch 'found + (dolist (pair gnus-article-address-banner-alist) + (when (string-match (car pair) from) + (throw 'found (cdr pair))))))))))))) + +(defun article-really-strip-banner (banner) + "Strip the banner specified by the argument." + (save-excursion + (save-restriction (let ((inhibit-point-motion-hooks t) - (banner (gnus-parameter-banner gnus-newsgroup-name)) (gnus-signature-limit nil) - buffer-read-only beg end) - (when (and gnus-article-address-banner-alist - (not banner)) - (setq banner - (let ((from (save-restriction - (widen) - (article-narrow-to-head) - (mail-fetch-field "from")))) - (when (and from - (setq from - (caar (mail-header-parse-addresses from)))) - (catch 'found - (dolist (pair gnus-article-address-banner-alist) - (when (string-match (car pair) from) - (throw 'found (cdr pair))))))))) - (when banner - (article-goto-body) - (cond - ((eq banner 'signature) - (when (gnus-article-narrow-to-signature) - (widen) - (forward-line -1) - (delete-region (point) (point-max)))) - ((symbolp banner) - (if (setq banner (cdr (assq banner gnus-article-banner-alist))) - (while (re-search-forward banner nil t) - (delete-region (match-beginning 0) (match-end 0))))) - ((stringp banner) - (while (re-search-forward banner nil t) - (delete-region (match-beginning 0) (match-end 0)))))))))) + buffer-read-only) + (article-goto-body) + (cond + ((eq banner 'signature) + (when (gnus-article-narrow-to-signature) + (widen) + (forward-line -1) + (delete-region (point) (point-max)))) + ((symbolp banner) + (if (setq banner (cdr (assq banner gnus-article-banner-alist))) + (while (re-search-forward banner nil t) + (delete-region (match-beginning 0) (match-end 0))))) + ((stringp banner) + (while (re-search-forward banner nil t) + (delete-region (match-beginning 0) (match-end 0))))))))) (defun article-babel () "Translate article using an online translation service." diff --git a/lisp/message.el b/lisp/message.el index c817653..d33986c 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -1535,7 +1535,7 @@ no, only reply back to the author." ;; We want to match the results of any of these manglings. ;; The following regexp rejects names whose first characters are ;; obviously bogus, but after that anything goes. - "\\([^\0-\b\n-\r\^?].*\\)? " + "\\([^\0-\b\n-\r\^?].*\\)?" ;; The time the message was sent. "\\([^\0-\r \^?]+\\) +" ; day of the week -- 1.7.10.4