[Emacs-diffs] /srv/bzr/emacs/trunk r105738: Merge changes made in Gnus trunk.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 105738
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Sun 2011-09-11 22:50:22 +0000
message:
  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.
modified:
  doc/misc/ChangeLog
  doc/misc/gnus.texi
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-agent.el
  lisp/gnus/gnus-group.el
  lisp/gnus/gnus-msg.el
  lisp/gnus/gnus-sum.el

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2011-09-10 23:30:53 +0000
+++ b/doc/misc/ChangeLog        2011-09-11 22:50:22 +0000
@@ -1,3 +1,9 @@
+2011-09-11  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * gnus.texi (Listing Groups): Explain `gnus-group-list-limit'.
+       (Finding the News): Doc clarification.
+       (Terminology): Mention naming.
+
 2011-09-10  Lars Magne Ingebrigtsen  <address@hidden>
 
        * gnus.texi: Remove mentions of `recent', which are now obsolete.

=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi        2011-09-10 23:30:53 +0000
+++ b/doc/misc/gnus.texi        2011-09-11 22:50:22 +0000
@@ -1011,7 +1011,7 @@
 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 @@
 @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
address@hidden / 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 @@
 @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
address@hidden: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

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-09-11 18:30:07 +0000
+++ b/lisp/gnus/ChangeLog       2011-09-11 22:50:22 +0000
@@ -8,12 +8,23 @@
 
 2011-09-11  Lars Magne Ingebrigtsen  <address@hidden>
 
+       * 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  <address@hidden>
+
        * gnus-dup.el (gnus-dup-suppress-articles): Move "Suppressing
        duplicates" to a higher level.
 
        * gnus-util.el (gnus-verbose): Lower default to 6 to get rid of the
        most egregious messages.
 
+2011-09-10  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * gnus-msg.el (gnus-summary-mail-forward): Minuscule doc fix.
+
 2011-09-10  Tetsuo Tsukamoto  <address@hidden>  (tiny change)
 
        * nnrss.el (nnrss-retrieve-groups): Decode the charset before looking

=== modified file 'lisp/gnus/gnus-agent.el'
--- a/lisp/gnus/gnus-agent.el   2011-08-21 09:39:07 +0000
+++ b/lisp/gnus/gnus-agent.el   2011-09-11 22:50:22 +0000
@@ -1933,7 +1933,7 @@
       (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.

=== modified file 'lisp/gnus/gnus-group.el'
--- a/lisp/gnus/gnus-group.el   2011-09-10 23:30:53 +0000
+++ b/lisp/gnus/gnus-group.el   2011-09-11 22:50:22 +0000
@@ -4636,7 +4636,12 @@
     (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)))

=== modified file 'lisp/gnus/gnus-msg.el'
--- a/lisp/gnus/gnus-msg.el     2011-08-26 04:25:55 +0000
+++ b/lisp/gnus/gnus-msg.el     2011-09-11 22:50:22 +0000
@@ -1225,7 +1225,7 @@
 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))

=== modified file 'lisp/gnus/gnus-sum.el'
--- a/lisp/gnus/gnus-sum.el     2011-09-10 23:30:53 +0000
+++ b/lisp/gnus/gnus-sum.el     2011-09-11 22:50:22 +0000
@@ -5543,7 +5543,7 @@
 (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 @@
            (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.