Merge changes made in Gnus master

2013-07-06 Lars Ingebrigtsen <larsi@gnus.org>
* gnus.texi (Group Parameters): Mention regexp
  substitutions (bug#11688).

2013-07-06 Nathan Trapuzzano <nbtrap@nbtrap.com> (tiny change)
* gnus.texi (Generic Marking Commands): Fix grammar (bug#13368).

2013-07-06 Lars Ingebrigtsen <larsi@gnus.org>
* gnus.texi (Emacsen): Fix version.
* gnus-faq.texi (FAQ 1-6): Mention the correct Emacs version.

2013-07-06 Lars Ingebrigtsen <larsi@gnus.org>
* 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
  <mailman.216.1372942181.12400.help-gnu-emacs@gnu.org>, "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).

7 files changed, 41 insertions, 16 deletions

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  <larsi@gnus.org>
+
+        * 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
+        <mailman.216.1372942181.12400.help-gnu-emacs@gnu.org>, "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  <dak@gnu.org>
 
         * 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.