Revision: miles@gnu.org--gnu-2005/gnus--devo--0--patch-40

Merge from gnus--rel--5.10

Patches applied:

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-17
   Update from CVS

2005-02-14  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus-group.el (gnus-group-make-doc-group): Mention prefix
   argument in doc string.  Make query for type more clear.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a57f15c..b028c2a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -35,6 +35,11 @@
 
        * gnus-agent.el: Remove garbage made while merging the Emacs trunk.
 
+2005-02-14  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus-group.el (gnus-group-make-doc-group): Mention prefix
+       argument in doc string.  Make query for type more clear.
+
 2005-02-09  Kim F. Storm  <storm@cua.dk>
 
        Change Emacs release version from 21.4 to 22.1 throughout.

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 87a13e9..e7bbf93 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -2551,7 +2551,9 @@ group already exists:
   (gnus-group-position-point))
 
 (defun gnus-group-make-doc-group (file type)
-  "Create a group that uses a single file as the source."
+  "Create a group that uses a single file as the source.
+
+If called with a prefix argument, ask for the file type."
   (interactive
    (list (read-file-name "File name: ")
         (and current-prefix-arg 'ask)))
@@ -2560,7 +2562,7 @@ group already exists:
          char found)
       (while (not found)
        (message
-        "%sFile type (mbox, babyl, digest, forward, mmdf, guess) [mbdfag]: "
+        "%sFile type (mbox, babyl, digest, forward, mmdf, guess) [m, b, d, f, a, g]: "
         err)
        (setq found (cond ((= (setq char (read-char)) ?m) 'mbox)
                          ((= char ?b) 'babyl)