From 6ed7a66a3f8781f66fce33f326ac2c5057de4c97 Mon Sep 17 00:00:00 2001 From: Gnus developers Date: Sat, 6 Jul 2013 23:40:56 +0000 Subject: [PATCH] Merge changes made in Gnus master 2013-07-06 Lars Ingebrigtsen * gnus.texi (Group Parameters): Mention regexp substitutions (bug#11688). 2013-07-06 Nathan Trapuzzano (tiny change) * gnus.texi (Generic Marking Commands): Fix grammar (bug#13368). 2013-07-06 Lars Ingebrigtsen * gnus.texi (Emacsen): Fix version. * gnus-faq.texi (FAQ 1-6): Mention the correct Emacs version. 2013-07-06 Lars Ingebrigtsen * gnus-art.el (gnus-block-private-groups): Allow `global' methods to display images. * gnus.el (gnus-valid-select-methods): Mark nnrss as global. * message.el (message-cancel-news): According to , "cancel" is preferred over "cmsg cancel" in the Subject. * nnir.el (nnir-engines): Note that the group specs are regexps (bug#13238). * gnus-msg.el (gnus-copy-article-buffer): If the article buffer has gotten read-only text properties, ensure that those aren't heeded when copying stuff over (bug#13434). * mm-view.el (mm-inline-text-html): Don't bug out on multipart messages (bug#13762). --- doc/misc/ChangeLog | 15 +++++++++++++++ doc/misc/gnus-faq.texi | 7 +++---- doc/misc/gnus.texi | 16 +++++++++++----- lisp/gnus/ChangeLog | 21 +++++++++++++++++++++ lisp/gnus/gnus-art.el | 3 ++- lisp/gnus/gnus-msg.el | 1 + lisp/gnus/gnus.el | 2 +- lisp/gnus/message.el | 2 +- lisp/gnus/mm-view.el | 22 ++++++++++++---------- lisp/gnus/nnir.el | 6 +++--- 10 files changed, 70 insertions(+), 25 deletions(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index e4a66e19877..5467d2cadca 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,18 @@ +2013-07-06 Lars Ingebrigtsen + + * gnus.texi (Group Parameters): Mention regexp + substitutions (bug#11688). + +2013-07-06 Nathan Trapuzzano (tiny change) + + * gnus.texi (Generic Marking Commands): Fix grammar (bug#13368). + +2013-07-06 Lars Ingebrigtsen + + * gnus.texi (Emacsen): Fix version. + + * gnus-faq.texi (FAQ 1-6): Mention the correct Emacs version. + 2013-07-06 Glenn Morris * mh-e.texi: Fix external links. diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi index ff29647d166..1a0469c14f4 100644 --- a/doc/misc/gnus-faq.texi +++ b/doc/misc/gnus-faq.texi @@ -222,10 +222,9 @@ Which version of Emacs do I need? @subsubheading Answer -Gnus 5.10 requires an Emacs version that is greater than or equal -to Emacs 20.7 or XEmacs 21.1. -The development versions of Gnus (aka No Gnus) requires Emacs 21 -or XEmacs 21.4. +Gnus 5.13 requires an Emacs version that is greater than or equal +to Emacs 23.1 or XEmacs 21.1, although there are some features that +only work on Emacs 24. @node FAQ 1-7 @subsubheading Question 1.7 diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 3d4bd378869..678521d1220 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -3091,6 +3091,12 @@ if address "sender" ["name@@one.org", "else@@two.org"] @{ @} @end example +You can also use regexp expansions in the rules: + +@example +(sieve header :regex "list-id" "") +@end example + See @pxref{Sieve Commands} for commands and variables that might be of interest in relation to the sieve parameter. @@ -6380,10 +6386,10 @@ The default is @code{t}. @node Generic Marking Commands @subsection Generic Marking Commands -Some people would like the command that ticks an article (@kbd{!}) go to -the next article. Others would like it to go to the next unread -article. Yet others would like it to stay on the current article. And -even though I haven't heard of anybody wanting it to go to the +Some people would like the command that ticks an article (@kbd{!}) to +go to the next article. Others would like it to go to the next unread +article. Yet others would like it to stay on the current article. +And even though I haven't heard of anybody wanting it to go to the previous (unread) article, I'm sure there are people that want that as well. @@ -26575,7 +26581,7 @@ This version of Gnus should work on: @itemize @bullet @item -Emacs 21.1 and up. +Emacs 23.1 and up. @item XEmacs 21.4 and up. diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 34eb28f0965..689444878d7 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,24 @@ +2013-07-06 Lars Ingebrigtsen + + * gnus-art.el (gnus-block-private-groups): Allow `global' methods to + display images. + + * gnus.el (gnus-valid-select-methods): Mark nnrss as global. + + * message.el (message-cancel-news): According to + , "cancel" is + preferred over "cmsg cancel" in the Subject. + + * nnir.el (nnir-engines): Note that the group specs are regexps + (bug#13238). + + * gnus-msg.el (gnus-copy-article-buffer): If the article buffer has + gotten read-only text properties, ensure that those aren't heeded when + copying stuff over (bug#13434). + + * mm-view.el (mm-inline-text-html): Don't bug out on multipart messages + (bug#13762). + 2013-07-05 David Kastrup * auth-source.el (auth-source-netrc-parse-one): Allow empty strings in diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 5840aacd7a3..b41ff9c0550 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -6947,7 +6947,8 @@ If given a prefix, show the hidden text instead." (set-buffer buf)))))) (defun gnus-block-private-groups (group) - (if (gnus-news-group-p group) + (if (or (gnus-news-group-p group) + (gnus-member-of-valid 'global group)) ;; Block nothing in news groups. nil ;; Block everything anywhere else. diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el index fce9a3633c2..e3f18662af4 100644 --- a/lisp/gnus/gnus-msg.el +++ b/lisp/gnus/gnus-msg.el @@ -920,6 +920,7 @@ header line with the old Message-ID." (with-current-buffer article-buffer (let ((gnus-newsgroup-charset (or gnus-article-charset gnus-newsgroup-charset)) + (inhibit-read-only t) (gnus-newsgroup-ignored-charsets (or gnus-article-ignored-charsets gnus-newsgroup-ignored-charsets))) diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index 9a927a1cfab..866e8f366b5 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el @@ -1628,7 +1628,7 @@ slower." ("nnfolder" mail respool address) ("nngateway" post-mail address prompt-address physical-address) ("nnweb" none) - ("nnrss" none) + ("nnrss" none global) ("nnagent" post-mail) ("nnimap" post-mail address prompt-address physical-address respool server-marks) diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index c6f5d904677..b35eb9dca12 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -7145,7 +7145,7 @@ If ARG, allow editing of the cancellation message." (erase-buffer) (insert "Newsgroups: " newsgroups "\n" "From: " from "\n" - "Subject: cmsg cancel " message-id "\n" + "Subject: cancel " message-id "\n" "Control: cancel " message-id "\n" (if distribution (concat "Distribution: " distribution "\n") diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el index b1cba27c335..9512a411d81 100644 --- a/lisp/gnus/mm-view.el +++ b/lisp/gnus/mm-view.el @@ -419,16 +419,18 @@ (buffer-string))))) (defun mm-inline-text-html (handle) - (let* ((func mm-text-html-renderer) - (entry (assq func mm-text-html-renderer-alist)) - (inhibit-read-only t)) - (if entry - (setq func (cdr entry))) - (cond - ((functionp func) - (funcall func handle)) - (t - (apply (car func) handle (cdr func)))))) + (if (stringp (car handle)) + (mapcar 'mm-inline-text-html (cdr handle)) + (let* ((func mm-text-html-renderer) + (entry (assq func mm-text-html-renderer-alist)) + (inhibit-read-only t)) + (if entry + (setq func (cdr entry))) + (cond + ((functionp func) + (funcall func handle)) + (t + (apply (car func) handle (cdr func))))))) (defun mm-inline-text-vcard (handle) (let ((inhibit-read-only t)) diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el index 22dee30e8fa..4dd123bf2c7 100644 --- a/lisp/gnus/nnir.el +++ b/lisp/gnus/nnir.el @@ -548,15 +548,15 @@ that it is for notmuch, not Namazu." (gmane nnir-run-gmane ((gmane-author . "Gmane Author: "))) (swish++ nnir-run-swish++ - ((swish++-group . "Swish++ Group spec: "))) + ((swish++-group . "Swish++ Group spec (regexp): "))) (swish-e nnir-run-swish-e - ((swish-e-group . "Swish-e Group spec: "))) + ((swish-e-group . "Swish-e Group spec (regexp): "))) (namazu nnir-run-namazu ()) (notmuch nnir-run-notmuch ()) (hyrex nnir-run-hyrex - ((hyrex-group . "Hyrex Group spec: "))) + ((hyrex-group . "Hyrex Group spec (regexp): "))) (find-grep nnir-run-find-grep ((grep-options . "Grep options: ")))) "Alist of supported search engines. -- 2.39.2