Merge changes made in Gnus trunk.

gnus.texi (Subscription Methods): Link to "Group Levels" to explain zombies.  (Checking New Groups): Ditto (bug#8974).
gnus.texi (Startup Files): Clarify that we're talking about numbered backups, and not actual vc (bug#8975).
gnus-group.el (gnus-read-ephemeral-bug-group): Bind the coding systems to binary before writing and reading the mbox files.
gnus.el (gnus-summary-line-format): Link to the info node for %U instead of trying to list them all (bug#8978).
pop3.el (pop3-open-server): Use :end-of-capability.
gnus-group.el (gnus-read-ephemeral-emacs-bug-group): Make sure that the id is always a number.
gnus-group.el (gnus-read-ephemeral-emacs-bug-group): Hook into debbugs mode, if possible.

6 files changed, 63 insertions, 21 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 474b7a0efab..e8b183bfe87 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,14 @@
+2011-07-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.texi (Subscription Methods): Link to "Group Levels" to explain
+        zombies.
+        (Checking New Groups): Ditto (bug#8974).
+
+2011-07-03  Dave Abrahams  <dave@boostpro.com>  (tiny change)
+
+        * gnus.texi (Startup Files): Clarify that we're talking about numbered
+        backups, and not actual vc (bug#8975).
+
 2011-07-03  Kevin Ryde  <user42@zip.com.au>
 
         * cl.texi (For Clauses): @items for hash-values and key-bindings
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index f98d4df2bde..a214f37817b 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -1167,16 +1167,17 @@ when you do the @kbd{g} command (@pxref{Scanning New Messages}).
 @node Checking New Groups
 @subsection Checking New Groups
 
-Gnus normally determines whether a group is new or not by comparing the
-list of groups from the active file(s) with the lists of subscribed and
-dead groups.  This isn't a particularly fast method.  If
-@code{gnus-check-new-newsgroups} is @code{ask-server}, Gnus will ask the
-server for new groups since the last time.  This is both faster and
-cheaper.  This also means that you can get rid of the list of killed
-groups altogether, so you may set @code{gnus-save-killed-list} to
-@code{nil}, which will save time both at startup, at exit, and all over.
-Saves disk space, too.  Why isn't this the default, then?
-Unfortunately, not all servers support this command.
+Gnus normally determines whether a group is new or not by comparing
+the list of groups (@pxref{Group Levels}) from the active file(s) with
+the lists of subscribed and dead groups.  This isn't a particularly
+fast method.  If @code{gnus-check-new-newsgroups} is
+@code{ask-server}, Gnus will ask the server for new groups since the
+last time.  This is both faster and cheaper.  This also means that you
+can get rid of the list of killed groups altogether, so you may set
+@code{gnus-save-killed-list} to @code{nil}, which will save time both
+at startup, at exit, and all over.  Saves disk space, too.  Why isn't
+this the default, then?  Unfortunately, not all servers support this
+command.
 
 I bet I know what you're thinking now: How do I find out whether my
 server supports @code{ask-server}?  No?  Good, because I don't have a
@@ -1214,9 +1215,10 @@ Some handy pre-fab functions are:
 
 @item gnus-subscribe-zombies
 @vindex gnus-subscribe-zombies
-Make all new groups zombies.  This is the default.  You can browse the
-zombies later (with @kbd{A z}) and either kill them all off properly
-(with @kbd{S z}), or subscribe to them (with @kbd{u}).
+Make all new groups zombies (@pxref{Group Levels}).  This is the
+default.  You can browse the zombies later (with @kbd{A z}) and either
+kill them all off properly (with @kbd{S z}), or subscribe to them
+(with @kbd{u}).
 
 @item gnus-subscribe-randomly
 @vindex gnus-subscribe-randomly
@@ -1430,7 +1432,7 @@ several servers where not all servers support @code{ask-server}.
 The @code{gnus-startup-file} variable says where the startup files are.
 The default value is @file{~/.newsrc}, with the Gnus (El Dingo) startup
 file being whatever that one is, with a @samp{.eld} appended.
-If you want version control for this file, set
+If you want to keep multiple numbered backups of this file, set
 @code{gnus-backup-startup-file}.  It respects the same values as the
 @code{version-control} variable.
 
@@ -2360,6 +2362,7 @@ empty subscribed groups and unsubscribed groups, too.  Type @kbd{l} to
 go back to showing nonempty subscribed groups again.  Thus, unsubscribed
 groups are hidden, in a way.
 
+@cindex zombie groups
 Zombie and killed groups are similar to unsubscribed groups in that they
 are hidden by default.  But they are different from subscribed and
 unsubscribed groups in that Gnus doesn't ask the news server for
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index eaf4e8e2383..47b41ffb98b 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,23 @@
+2011-07-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-group.el (gnus-read-ephemeral-bug-group): Bind the coding
+        systems to binary before writing and reading the mbox files.
+
+        * gnus.el (gnus-summary-line-format): Link to the info node for %U
+        instead of trying to list them all (bug#8978).
+
+2011-07-03  Wolfgang Jenkner  <wjenkner@inode.at>  (tiny change)
+
+        * pop3.el (pop3-open-server): Use :end-of-capability.
+
+2011-07-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-group.el (gnus-read-ephemeral-emacs-bug-group): Make sure that
+        the id is always a number.
+
+        * gnus-group.el (gnus-read-ephemeral-emacs-bug-group): Hook into
+        debbugs mode, if possible.
+
 2011-07-02  Daiki Ueno  <ueno@unixuser.org>
 
         * auth-source.el (auth-source-token-passphrase-callback-function):
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 74b1c7042ee..83383186ca9 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -2437,7 +2437,9 @@ the bug number, and browsing the URL must return mbox output."
                      (cdr (assoc 'emacs gnus-bug-group-download-format-alist))))
   (when (stringp number)
     (setq number (string-to-number number)))
-  (let ((tmpfile (mm-make-temp-file "gnus-temp-group-")))
+  (let ((tmpfile (mm-make-temp-file "gnus-temp-group-"))
+        (coding-system-for-write 'binary)
+        (coding-system-for-read 'binary))
     (with-temp-file tmpfile
       (url-insert-file-contents (format mbox-url number))
       (goto-char (point-min))
@@ -2466,12 +2468,17 @@ the bug number, and browsing the URL must return mbox output."
 
 (defun gnus-read-ephemeral-emacs-bug-group (number &optional window-conf)
   "Browse Emacs bug NUMBER as ephemeral group."
-  (interactive (list (read-string "Enter bug number: "
-                                  (thing-at-point 'word) nil)))
+  (interactive (list (string-to-number
+                      (read-string "Enter bug number: "
+                                   (thing-at-point 'word) nil))))
   (gnus-read-ephemeral-bug-group
    number
    (cdr (assoc 'emacs gnus-bug-group-download-format-alist))
-   window-conf))
+   window-conf)
+  (when (boundp 'debbugs-summary-mode)
+    (with-current-buffer (window-buffer (selected-window))
+      (debbugs-summary-mode 1)
+      (set (make-local-variable 'debbugs-bug-number) number))))
 
 (defun gnus-group-jump-to-group (group &optional prompt)
   "Jump to newsgroup GROUP.
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index e8e3a8955ba..98a2684dd61 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -2966,8 +2966,8 @@ with some simple extensions.
             on level one
 %R          \"A\" if this article has been replied to, \" \"
             otherwise (character)
-%U          Status of this article (character, \"R\", \"K\",
-            \"-\" or \" \")
+%U          \"Read\" status of this article.
+            See Info node `(gnus)Read Articles'
 %[          Opening bracket (character, \"[\" or \"<\")
 %]          Closing bracket (character, \"]\" or \">\")
 %>          Spaces of length thread-level (string)
diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el
index 90e11b3ca8f..b485ac39f60 100644
--- a/lisp/gnus/pop3.el
+++ b/lisp/gnus/pop3.el
@@ -306,7 +306,8 @@ Returns the process associated with the connection."
                     (t
                      (or pop3-stream-type 'network)))
              :capability-command "CAPA\r\n"
-             :end-of-command "^\\.\r?\n\\|^\\(-ERR\\|+OK \\).*\n"
+             :end-of-command "^\\(-ERR\\|+OK \\).*\n"
+             :end-of-capability "^\\.\r?\n"
              :success "^\\+OK.*\n"
              :return-list t
              :starttls-function