Commit 6ed7a66a authored by Gnus developers's avatar Gnus developers Committed by Katsumi Yamaoka
Browse files

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).
parent 219afb88
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 Glenn Morris <rgm@gnu.org>
* mh-e.texi: Fix external links.
......
......@@ -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
......
......@@ -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" "<c++std-\\1.accu.org>")
@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.
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
......
......@@ -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.
......
......@@ -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)))
......
......@@ -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)
......
......@@ -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")
......
......@@ -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))
......
......@@ -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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment