From: Lars Magne Ingebrigtsen Date: Sun, 11 Sep 2011 22:50:22 +0000 (+0000) Subject: Merge changes made in Gnus trunk. X-Git-Tag: emacs-pretest-24.0.90~104^2~80 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0afb49a1bf4435b06d1296ecf00fd032da386cd6;p=emacs.git 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. --- 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 @@ +2011-09-11 Lars Magne Ingebrigtsen + + * gnus.texi (Listing Groups): Explain `gnus-group-list-limit'. + (Finding the News): Doc clarification. + (Terminology): Mention naming. + 2011-09-10 Lars Magne Ingebrigtsen * 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 news. This variable should be a list where the first element says @dfn{how} and the second element says @dfn{where}. This method is your native method. All groups not fetched with this method are -foreign groups. +secondary or foreign groups. For instance, if the @samp{news.somewhere.edu} @acronym{NNTP} server is where you 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}). @item A / @kindex A / (Group) @findex gnus-group-list-limit -List groups limited within the current selection -(@code{gnus-group-list-limit}). +Further limit groups within the current selection +(@code{gnus-group-list-limit}). If you've first limited to groups +with dormant articles with @kbd{A ?}, you can then further limit with +@kbd{A / c}, which will then limit to groups with cached articles, +giving you the groups that have both dormant articles and cached +articles. @item A f @kindex A f (Group) @@ -28572,18 +28576,21 @@ confusing. @item native @cindex native Gnus will always use one method (and back end) as the @dfn{native}, or -default, way of getting news. +default, way of getting news. Groups from the native select method +have names like @samp{gnu.emacs.gnus}. @item foreign @cindex foreign -You can also have any number of foreign groups active at the same time. -These are groups that use non-native non-secondary back ends for getting -news. +You can also have any number of foreign groups active at the same +time. These are groups that use non-native non-secondary back ends +for getting news. Foreign groups have names like +@samp{nntp+news.gmane.org:gmane.emacs.gnus.devel}. @item secondary @cindex secondary -Secondary back ends are somewhere half-way between being native and being -foreign, but they mostly act like they are native. +Secondary back ends are somewhere half-way between being native and +being foreign, but they mostly act like they are native, but they, too +have names like @samp{nntp+news.gmane.org:gmane.emacs.gnus.devel}. @item article @cindex article diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index b1fcb5429d6..501ff5b59d0 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -6,6 +6,13 @@ switch-to-buffer-other-frame and switch-to-buffer-other-window instead of setting buffer display varibles. +2011-09-11 Lars Magne Ingebrigtsen + + * gnus-group.el (gnus-group-list-limit): Explain what the command + does. + + * gnus-sum.el (gnus-fetch-headers): Bump message level. + 2011-09-11 Lars Magne Ingebrigtsen * gnus-dup.el (gnus-dup-suppress-articles): Move "Suppressing @@ -14,6 +21,10 @@ * gnus-util.el (gnus-verbose): Lower default to 6 to get rid of the most egregious messages. +2011-09-10 Lars Magne Ingebrigtsen + + * gnus-msg.el (gnus-summary-mail-forward): Minuscule doc fix. + 2011-09-10 Tetsuo Tsukamoto (tiny change) * 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." (with-current-buffer nntp-server-buffer (if articles (progn - (gnus-message 7 "Fetching headers for %s..." + (gnus-message 8 "Fetching headers for %s..." (gnus-agent-decoded-group-name group)) ;; 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." (gnus-group-list-plus args))) (defun gnus-group-list-limit (&optional args) - "List groups limited within the current selection." + "List groups limited within the current selection. +If you've limited the groups, you can further limit the selection +with this command. If you've first limited to groups with +dormant articles with `A ?', you can then further limit with +`A / c', which will then limit to groups with cached articles, giving +you the groups that have both dormant articles and cached articles." (interactive "P") (let ((gnus-group-list-option 'limit)) (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; if ARG is 4, forward message directly inline; otherwise, use flipped `message-forward-as-mime'. If POST, post instead of mail. -For the `inline' alternatives, also see the variable +For the \"inline\" alternatives, also see the variable `message-forward-ignored-headers'." (interactive "P") (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." (defun gnus-fetch-headers (articles &optional limit force-new dependencies) "Fetch headers of ARTICLES." (let ((name (gnus-group-decoded-name gnus-newsgroup-name))) - (gnus-message 5 "Fetching headers for %s..." name) + (gnus-message 7 "Fetching headers for %s..." name) (prog1 (if (eq 'nov (setq gnus-headers-retrieved-by @@ -5560,7 +5560,7 @@ or a straight list of headers." (gnus-get-newsgroup-headers-xover articles force-new dependencies gnus-newsgroup-name t) (gnus-get-newsgroup-headers dependencies force-new)) - (gnus-message 5 "Fetching headers for %s...done" name)))) + (gnus-message 7 "Fetching headers for %s...done" name)))) (defun gnus-select-newsgroup (group &optional read-all select-articles) "Select newsgroup GROUP.