From 6ed7a66a3f8781f66fce33f326ac2c5057de4c97 Mon Sep 17 00:00:00 2001 From: Gnus developers Date: Sat, 6 Jul 2013 23:40:56 +0000 Subject: 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). --- lisp/gnus/message.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp/gnus/message.el') 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") -- cgit v1.2.1