Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-676

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 169-173)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS

2005-12-16  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-art.el (gnus-signature-separator): Fix custom type.

   * lisp/gnus/mm-decode.el (mm-inlined-types): Fix custom type.
   (mm-keep-viewer-alive-types): Ditto.
   (mm-automatic-display): Ditto.
   (mm-attachment-override-types): Ditto.
   (mm-inline-override-types): Ditto.
   (mm-automatic-external-display): Ditto.

2005-12-12  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-art.el (gnus-buttonized-mime-types): Mention addition of
   multipart/alternative and add xref to mm-discouraged-alternatives
   in doc string.

   * lisp/gnus/mm-decode.el (mm-discouraged-alternatives): Add xref to
   gnus-buttonized-mime-types in doc string.

2005-12-12  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/rfc2047.el (rfc2047-charset-to-coding-system): Recognize
   us-ascii as a MIME charset.

   * lisp/gnus/mm-bodies.el (mm-decode-content-transfer-encoding): Protect
   against the case where the 2nd arg TYPE is nil.

2005-12-09  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/gnus-start.el (gnus-no-server-1): Mention
   `gnus-level-default-subscribed' in doc string.

2005-11-26  Dave Love  <fx@gnu.org>

   * lisp/gnus/tls.el (open-tls-stream): Rename arg SERVICE to PORT.
   (tls-program, tls-success): Provide openssl alternative.

   * lisp/gnus/starttls.el: Doc fixes.
   (starttls-open-stream-gnutls, starttls-open-stream): Rename arg
   SERVICE to PORT.

2005-12-09  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/gnus-start.el (gnus-start-draft-setup): Enforce
   `gnus-draft-mode' for nndraft:drafts at startup.

   * lisp/gnus/gnus.el (gnus-splash): Change custom group.
   (gnus-group-get-parameter, gnus-group-parameter-value): Describe
   allow-list argument.

   * lisp/gnus/gnus-agent.el (gnus-agent-article-alist-save-format): Format doc
   string.

2005-12-09  ARISAWA Akihiro  <ari@mbf.ocn.ne.jp>  (tiny change)

   * lisp/gnus/mm-decode.el (mm-display-external): Add lacked cdr.

2005-12-12  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/gnus.texi (MIME Commands): Mention addition of
   multipart/alternative to gnus-buttonized-mime-types and add xref
   to mm-discouraged-alternatives.

   * man/emacs-mime.texi (Display Customization): Mention addition of
   "image/.*" and add xref to gnus-buttonized-mime-types in the
   mm-discouraged-alternatives section.

1 files changed, 11 insertions, 6 deletions

diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index d3b313c621f..53bcc4be15f 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -717,11 +717,12 @@ the first newsgroup."
 
 (defun gnus-no-server-1 (&optional arg slave)
   "Read network news.
-If ARG is a positive number, Gnus will use that as the
-startup level.	If ARG is nil, Gnus will be started at level 2.
-If ARG is non-nil and not a positive number, Gnus will
-prompt the user for the name of an NNTP server to use.
-As opposed to `gnus', this command will not connect to the local server."
+If ARG is a positive number, Gnus will use that as the startup
+level.  If ARG is nil, Gnus will be started at level 2
+\(`gnus-level-default-subscribed' minus one).  If ARG is non-nil
+and not a positive number, Gnus will prompt the user for the name
+of an NNTP server to use.  As opposed to \\[gnus], this command
+will not connect to the local server."
   (interactive "P")
   (let ((val (or arg (1- gnus-level-default-subscribed))))
     (gnus val t slave)
@@ -805,8 +806,12 @@ prompt the user for the name of an NNTP server to use."
   "Make sure the draft group exists."
   (gnus-request-create-group "drafts" '(nndraft ""))
   (unless (gnus-gethash "nndraft:drafts" gnus-newsrc-hashtb)
+    (gnus-message 3 "Subscribing drafts group")
     (let ((gnus-level-default-subscribed 1))
-      (gnus-subscribe-group "nndraft:drafts" nil '(nndraft "")))
+      (gnus-subscribe-group "nndraft:drafts" nil '(nndraft ""))))
+  (unless (equal (gnus-group-get-parameter "nndraft:drafts" 'gnus-dummy t)
+		 '((gnus-draft-mode)))
+    (gnus-message 3 "Setting up drafts group")
     (gnus-group-set-parameter
      "nndraft:drafts" 'gnus-dummy '((gnus-draft-mode)))))