aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-09-11 22:50:22 +0000
committerKatsumi Yamaoka2011-09-11 22:50:22 +0000
commit0afb49a1bf4435b06d1296ecf00fd032da386cd6 (patch)
tree4e8ab6959c99530b7db9d19e7de37bed8ae96ca4
parent20f53c697985dffdec6a29a2f8b0aa6fa5ee820a (diff)
downloademacs-0afb49a1bf4435b06d1296ecf00fd032da386cd6.tar.gz
emacs-0afb49a1bf4435b06d1296ecf00fd032da386cd6.zip
Merge changes made in Gnus trunk.
gnus.texi (Listing Groups): Explain `gnus-group-list-limit'. (Finding the News): Doc clarification. (Terminology): Mention naming. gnus-group.el (gnus-group-list-limit): Explain what the command does. gnus-sum.el (gnus-fetch-headers): Bump message level.
-rw-r--r--doc/misc/ChangeLog6
-rw-r--r--doc/misc/gnus.texi25
-rw-r--r--lisp/gnus/ChangeLog11
-rw-r--r--lisp/gnus/gnus-agent.el2
-rw-r--r--lisp/gnus/gnus-group.el7
-rw-r--r--lisp/gnus/gnus-msg.el2
-rw-r--r--lisp/gnus/gnus-sum.el4
7 files changed, 43 insertions, 14 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index cd0c62b2e09..9826523227c 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,9 @@
12011-09-11 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * gnus.texi (Listing Groups): Explain `gnus-group-list-limit'.
4 (Finding the News): Doc clarification.
5 (Terminology): Mention naming.
6
12011-09-10 Lars Magne Ingebrigtsen <larsi@gnus.org> 72011-09-10 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 8
3 * gnus.texi: Remove mentions of `recent', which are now obsolete. 9 * gnus.texi: Remove mentions of `recent', which are now obsolete.
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 9f886e3dc6e..59c39893c13 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -1011,7 +1011,7 @@ The @code{gnus-select-method} variable says where Gnus should look for
1011news. This variable should be a list where the first element says 1011news. This variable should be a list where the first element says
1012@dfn{how} and the second element says @dfn{where}. This method is your 1012@dfn{how} and the second element says @dfn{where}. This method is your
1013native method. All groups not fetched with this method are 1013native method. All groups not fetched with this method are
1014foreign groups. 1014secondary or foreign groups.
1015 1015
1016For instance, if the @samp{news.somewhere.edu} @acronym{NNTP} server is where 1016For instance, if the @samp{news.somewhere.edu} @acronym{NNTP} server is where
1017you want to get your daily dosage of news from, you'd say: 1017you want to get your daily dosage of news from, you'd say:
@@ -3335,8 +3335,12 @@ List all groups with ticked articles (@code{gnus-group-list-ticked}).
3335@item A / 3335@item A /
3336@kindex A / (Group) 3336@kindex A / (Group)
3337@findex gnus-group-list-limit 3337@findex gnus-group-list-limit
3338List groups limited within the current selection 3338Further limit groups within the current selection
3339(@code{gnus-group-list-limit}). 3339(@code{gnus-group-list-limit}). If you've first limited to groups
3340with dormant articles with @kbd{A ?}, you can then further limit with
3341@kbd{A / c}, which will then limit to groups with cached articles,
3342giving you the groups that have both dormant articles and cached
3343articles.
3340 3344
3341@item A f 3345@item A f
3342@kindex A f (Group) 3346@kindex A f (Group)
@@ -28572,18 +28576,21 @@ confusing.
28572@item native 28576@item native
28573@cindex native 28577@cindex native
28574Gnus will always use one method (and back end) as the @dfn{native}, or 28578Gnus will always use one method (and back end) as the @dfn{native}, or
28575default, way of getting news. 28579default, way of getting news. Groups from the native select method
28580have names like @samp{gnu.emacs.gnus}.
28576 28581
28577@item foreign 28582@item foreign
28578@cindex foreign 28583@cindex foreign
28579You can also have any number of foreign groups active at the same time. 28584You can also have any number of foreign groups active at the same
28580These are groups that use non-native non-secondary back ends for getting 28585time. These are groups that use non-native non-secondary back ends
28581news. 28586for getting news. Foreign groups have names like
28587@samp{nntp+news.gmane.org:gmane.emacs.gnus.devel}.
28582 28588
28583@item secondary 28589@item secondary
28584@cindex secondary 28590@cindex secondary
28585Secondary back ends are somewhere half-way between being native and being 28591Secondary back ends are somewhere half-way between being native and
28586foreign, but they mostly act like they are native. 28592being foreign, but they mostly act like they are native, but they, too
28593have names like @samp{nntp+news.gmane.org:gmane.emacs.gnus.devel}.
28587 28594
28588@item article 28595@item article
28589@cindex article 28596@cindex article
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index b1fcb5429d6..501ff5b59d0 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -8,12 +8,23 @@
8 8
92011-09-11 Lars Magne Ingebrigtsen <larsi@gnus.org> 92011-09-11 Lars Magne Ingebrigtsen <larsi@gnus.org>
10 10
11 * gnus-group.el (gnus-group-list-limit): Explain what the command
12 does.
13
14 * gnus-sum.el (gnus-fetch-headers): Bump message level.
15
162011-09-11 Lars Magne Ingebrigtsen <larsi@gnus.org>
17
11 * gnus-dup.el (gnus-dup-suppress-articles): Move "Suppressing 18 * gnus-dup.el (gnus-dup-suppress-articles): Move "Suppressing
12 duplicates" to a higher level. 19 duplicates" to a higher level.
13 20
14 * gnus-util.el (gnus-verbose): Lower default to 6 to get rid of the 21 * gnus-util.el (gnus-verbose): Lower default to 6 to get rid of the
15 most egregious messages. 22 most egregious messages.
16 23
242011-09-10 Lars Magne Ingebrigtsen <larsi@gnus.org>
25
26 * gnus-msg.el (gnus-summary-mail-forward): Minuscule doc fix.
27
172011-09-10 Tetsuo Tsukamoto <tt.tetsuo.tsukamoto@gmail.com> (tiny change) 282011-09-10 Tetsuo Tsukamoto <tt.tetsuo.tsukamoto@gmail.com> (tiny change)
18 29
19 * nnrss.el (nnrss-retrieve-groups): Decode the charset before looking 30 * nnrss.el (nnrss-retrieve-groups): Decode the charset before looking
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index 26222119b98..669f9675536 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -1933,7 +1933,7 @@ article numbers will be returned."
1933 (with-current-buffer nntp-server-buffer 1933 (with-current-buffer nntp-server-buffer
1934 (if articles 1934 (if articles
1935 (progn 1935 (progn
1936 (gnus-message 7 "Fetching headers for %s..." 1936 (gnus-message 8 "Fetching headers for %s..."
1937 (gnus-agent-decoded-group-name group)) 1937 (gnus-agent-decoded-group-name group))
1938 1938
1939 ;; Fetch them. 1939 ;; Fetch them.
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 36fb9e8343b..f6cf7248a27 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -4636,7 +4636,12 @@ This command may read the active file."
4636 (gnus-group-list-plus args))) 4636 (gnus-group-list-plus args)))
4637 4637
4638(defun gnus-group-list-limit (&optional args) 4638(defun gnus-group-list-limit (&optional args)
4639 "List groups limited within the current selection." 4639 "List groups limited within the current selection.
4640If you've limited the groups, you can further limit the selection
4641with this command. If you've first limited to groups with
4642dormant articles with `A ?', you can then further limit with
4643`A / c', which will then limit to groups with cached articles, giving
4644you the groups that have both dormant articles and cached articles."
4640 (interactive "P") 4645 (interactive "P")
4641 (let ((gnus-group-list-option 'limit)) 4646 (let ((gnus-group-list-option 'limit))
4642 (gnus-group-list-plus args))) 4647 (gnus-group-list-plus args)))
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index d60c7165abd..e6a06a0500d 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -1225,7 +1225,7 @@ if ARG is 3, decode message and forward as an rfc822 MIME section;
1225if ARG is 4, forward message directly inline; 1225if ARG is 4, forward message directly inline;
1226otherwise, use flipped `message-forward-as-mime'. 1226otherwise, use flipped `message-forward-as-mime'.
1227If POST, post instead of mail. 1227If POST, post instead of mail.
1228For the `inline' alternatives, also see the variable 1228For the \"inline\" alternatives, also see the variable
1229`message-forward-ignored-headers'." 1229`message-forward-ignored-headers'."
1230 (interactive "P") 1230 (interactive "P")
1231 (if (cdr (gnus-summary-work-articles nil)) 1231 (if (cdr (gnus-summary-work-articles nil))
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 7e63237c676..8651b583757 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -5543,7 +5543,7 @@ or a straight list of headers."
5543(defun gnus-fetch-headers (articles &optional limit force-new dependencies) 5543(defun gnus-fetch-headers (articles &optional limit force-new dependencies)
5544 "Fetch headers of ARTICLES." 5544 "Fetch headers of ARTICLES."
5545 (let ((name (gnus-group-decoded-name gnus-newsgroup-name))) 5545 (let ((name (gnus-group-decoded-name gnus-newsgroup-name)))
5546 (gnus-message 5 "Fetching headers for %s..." name) 5546 (gnus-message 7 "Fetching headers for %s..." name)
5547 (prog1 5547 (prog1
5548 (if (eq 'nov 5548 (if (eq 'nov
5549 (setq gnus-headers-retrieved-by 5549 (setq gnus-headers-retrieved-by
@@ -5560,7 +5560,7 @@ or a straight list of headers."
5560 (gnus-get-newsgroup-headers-xover 5560 (gnus-get-newsgroup-headers-xover
5561 articles force-new dependencies gnus-newsgroup-name t) 5561 articles force-new dependencies gnus-newsgroup-name t)
5562 (gnus-get-newsgroup-headers dependencies force-new)) 5562 (gnus-get-newsgroup-headers dependencies force-new))
5563 (gnus-message 5 "Fetching headers for %s...done" name)))) 5563 (gnus-message 7 "Fetching headers for %s...done" name))))
5564 5564
5565(defun gnus-select-newsgroup (group &optional read-all select-articles) 5565(defun gnus-select-newsgroup (group &optional read-all select-articles)
5566 "Select newsgroup GROUP. 5566 "Select newsgroup GROUP.