From: Gnus developers <ding@gnus.org>
Date: Fri, 23 Mar 2012 11:22:21 +0000 (+0000)
Subject: Merge changes made in No Gnus
X-Git-Tag: emacs-pretest-24.0.05~69
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=005a89ffd3550983ca3c85334d79c7fad633c9c0;p=emacs.git

Merge changes made in No Gnus

2012-03-22  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 * auth-source.el (auth-source-netrc-create): Quote tokens that contain
 "#" to avoid having them interpreted as comments.
2012-03-22  Peder O. Klingenberg  <peder@klingenberg.no>  (tiny change)
 * gnus.texi (Archived Messages): Update `gnus-message-archive-group' to
 reflect the new default.
---

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index c95aaa9b15d..8d40ab5ab15 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-22  Peder O. Klingenberg  <peder@klingenberg.no>  (tiny change)
+
+	* gnus.texi (Archived Messages): Update `gnus-message-archive-group' to
+	reflect the new default.
+
 2012-03-10  Eli Zaretskii  <eliz@gnu.org>
 
 	* info.texi (Expert Info): Move the index entry for "Texinfo" from
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index c3b62f3b791..9e440be6585 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -12526,8 +12526,8 @@ mode buffers.
 Gnus provides a few different methods for storing the mail and news you
 send.  The default method is to use the @dfn{archive virtual server} to
 store the messages.  If you want to disable this completely, the
-@code{gnus-message-archive-group} variable should be @code{nil}, which
-is the default.
+@code{gnus-message-archive-group} variable should be @code{nil}.  The
+default is "sent.%Y-%m", which gives you one archive group per month.
 
 For archiving interesting messages in a group you read, see the
 @kbd{B c} (@code{gnus-summary-copy-article}) command (@pxref{Mail
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 878b9b9eb6b..ef0f1c5c852 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-22  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* auth-source.el (auth-source-netrc-create): Quote tokens that contain
+	"#" to avoid having them interpreted as comments.
+
 2012-03-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* shr.el (shr-insert): Update the text state properly to avoid
diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el
index 80a3b91b60a..34fe5afe7af 100644
--- a/lisp/gnus/auth-source.el
+++ b/lisp/gnus/auth-source.el
@@ -1293,7 +1293,7 @@ See `auth-source-search' for details on SPEC."
                                      (secret "password")
                                      (port   "port") ; redundant but clearer
                                      (t (symbol-name r)))
-                                   (if (string-match "[\" ]" data)
+                                   (if (string-match "[\"# ]" data)
                                        (format "%S" data)
                                      data)))))
             (setq add (concat add (funcall printer)))))))