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

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 107663
author: Gnus developers <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Fri 2012-03-23 11:22:21 +0000
message:
  Merge changes made in No Gnus
  
  2012-03-22  Lars Magne Ingebrigtsen  <address@hidden>
   * auth-source.el (auth-source-netrc-create): Quote tokens that contain
   "#" to avoid having them interpreted as comments.
  2012-03-22  Peder O. Klingenberg  <address@hidden>  (tiny change)
   * gnus.texi (Archived Messages): Update `gnus-message-archive-group' to
   reflect the new default.
modified:
  doc/misc/ChangeLog
  doc/misc/gnus.texi
  lisp/gnus/ChangeLog
  lisp/gnus/auth-source.el

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2012-03-10 09:40:05 +0000
+++ b/doc/misc/ChangeLog        2012-03-23 11:22:21 +0000
@@ -1,3 +1,8 @@
+2012-03-22  Peder O. Klingenberg  <address@hidden>  (tiny change)
+
+       * gnus.texi (Archived Messages): Update `gnus-message-archive-group' to
+       reflect the new default.
+
 2012-03-10  Eli Zaretskii  <address@hidden>
 
        * info.texi (Expert Info): Move the index entry for "Texinfo" from

=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi        2012-02-28 08:17:21 +0000
+++ b/doc/misc/gnus.texi        2012-03-23 11:22:21 +0000
@@ -12526,8 +12526,8 @@
 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
address@hidden variable should be @code{nil}, which
-is the default.
address@hidden 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

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-03-19 14:44:14 +0000
+++ b/lisp/gnus/ChangeLog       2012-03-23 11:22:21 +0000
@@ -1,3 +1,8 @@
+2012-03-22  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * auth-source.el (auth-source-netrc-create): Quote tokens that contain
+       "#" to avoid having them interpreted as comments.
+
 2012-03-19  Lars Magne Ingebrigtsen  <address@hidden>
 
        * shr.el (shr-insert): Update the text state properly to avoid

=== modified file 'lisp/gnus/auth-source.el'
--- a/lisp/gnus/auth-source.el  2012-02-11 22:13:29 +0000
+++ b/lisp/gnus/auth-source.el  2012-03-23 11:22:21 +0000
@@ -1293,7 +1293,7 @@
                                      (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)))))))