[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r113311: Merge changes made in Gnus master
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] trunk r113311: Merge changes made in Gnus master |
Date: |
Sat, 06 Jul 2013 23:41:18 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 113311
revision-id: address@hidden
parent: address@hidden
author: Gnus developers <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Sat 2013-07-06 23:40:56 +0000
message:
Merge changes made in Gnus master
2013-07-06 Lars Ingebrigtsen <address@hidden>
* gnus.texi (Group Parameters): Mention regexp
substitutions (bug#11688).
2013-07-06 Nathan Trapuzzano <address@hidden> (tiny change)
* gnus.texi (Generic Marking Commands): Fix grammar (bug#13368).
2013-07-06 Lars Ingebrigtsen <address@hidden>
* gnus.texi (Emacsen): Fix version.
* gnus-faq.texi (FAQ 1-6): Mention the correct Emacs version.
2013-07-06 Lars Ingebrigtsen <address@hidden>
* 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
<address@hidden>, "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).
modified:
doc/misc/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6331
doc/misc/gnus-faq.texi
gnusfaq.texi-20091113204419-o5vbwnq5f7feedwu-6304
doc/misc/gnus.texi gnus.texi-20091113204419-o5vbwnq5f7feedwu-6305
lisp/gnus/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1433
lisp/gnus/gnus-art.el gnusart.el-20091113204419-o5vbwnq5f7feedwu-1108
lisp/gnus/gnus-msg.el gnusmsg.el-20091113204419-o5vbwnq5f7feedwu-1127
lisp/gnus/gnus.el gnus.el-20091113204419-o5vbwnq5f7feedwu-1144
lisp/gnus/message.el message.el-20091113204419-o5vbwnq5f7feedwu-1145
lisp/gnus/mm-view.el mmview.el-20091113204419-o5vbwnq5f7feedwu-1976
lisp/gnus/nnir.el nnir.el-20091113204419-o5vbwnq5f7feedwu-8675
=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog 2013-07-06 01:39:21 +0000
+++ b/doc/misc/ChangeLog 2013-07-06 23:40:56 +0000
@@ -1,3 +1,18 @@
+2013-07-06 Lars Ingebrigtsen <address@hidden>
+
+ * gnus.texi (Group Parameters): Mention regexp
+ substitutions (bug#11688).
+
+2013-07-06 Nathan Trapuzzano <address@hidden> (tiny change)
+
+ * gnus.texi (Generic Marking Commands): Fix grammar (bug#13368).
+
+2013-07-06 Lars Ingebrigtsen <address@hidden>
+
+ * gnus.texi (Emacsen): Fix version.
+
+ * gnus-faq.texi (FAQ 1-6): Mention the correct Emacs version.
+
2013-07-06 Glenn Morris <address@hidden>
* mh-e.texi: Fix external links.
=== modified file 'doc/misc/gnus-faq.texi'
--- a/doc/misc/gnus-faq.texi 2013-07-06 01:39:21 +0000
+++ b/doc/misc/gnus-faq.texi 2013-07-06 23:40:56 +0000
@@ -222,10 +222,9 @@
@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
=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi 2013-07-06 01:39:21 +0000
+++ b/doc/misc/gnus.texi 2013-07-06 23:40:56 +0000
@@ -3091,6 +3091,12 @@
@}
@end example
+You can also use regexp expansions in the rules:
+
address@hidden
+(sieve header :regex "list-id" "<c++std-\\1.accu.org>")
address@hidden example
+
See @pxref{Sieve Commands} for commands and variables that might be of
interest in relation to the sieve parameter.
@@ -6380,10 +6386,10 @@
@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 @@
@itemize @bullet
@item
-Emacs 21.1 and up.
+Emacs 23.1 and up.
@item
XEmacs 21.4 and up.
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2013-07-06 12:49:38 +0000
+++ b/lisp/gnus/ChangeLog 2013-07-06 23:40:56 +0000
@@ -1,3 +1,24 @@
+2013-07-06 Lars Ingebrigtsen <address@hidden>
+
+ * 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
+ <address@hidden>, "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 <address@hidden>
* auth-source.el (auth-source-netrc-parse-one): Allow empty strings in
=== modified file 'lisp/gnus/gnus-art.el'
--- a/lisp/gnus/gnus-art.el 2013-06-28 08:03:21 +0000
+++ b/lisp/gnus/gnus-art.el 2013-07-06 23:40:56 +0000
@@ -6947,7 +6947,8 @@
(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.
=== modified file 'lisp/gnus/gnus-msg.el'
--- a/lisp/gnus/gnus-msg.el 2013-04-26 02:08:43 +0000
+++ b/lisp/gnus/gnus-msg.el 2013-07-06 23:40:56 +0000
@@ -920,6 +920,7 @@
(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)))
=== modified file 'lisp/gnus/gnus.el'
--- a/lisp/gnus/gnus.el 2013-07-02 10:38:58 +0000
+++ b/lisp/gnus/gnus.el 2013-07-06 23:40:56 +0000
@@ -1628,7 +1628,7 @@
("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)
=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el 2013-05-19 22:50:16 +0000
+++ b/lisp/gnus/message.el 2013-07-06 23:40:56 +0000
@@ -7145,7 +7145,7 @@
(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")
=== modified file 'lisp/gnus/mm-view.el'
--- a/lisp/gnus/mm-view.el 2013-06-10 05:17:51 +0000
+++ b/lisp/gnus/mm-view.el 2013-07-06 23:40:56 +0000
@@ -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))
=== modified file 'lisp/gnus/nnir.el'
--- a/lisp/gnus/nnir.el 2013-07-02 10:38:58 +0000
+++ b/lisp/gnus/nnir.el 2013-07-06 23:40:56 +0000
@@ -548,15 +548,15 @@
(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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r113311: Merge changes made in Gnus master,
Katsumi Yamaoka <=