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

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 107015
author: Gnus developers <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2012-01-30 23:30:22 +0000
message:
  Merge changes made in Gnus trunk
  
  gnus.texi (Agent Basics): Fix outdated description of 
`gnus-agent-auto-agentize-methods'.
  rfc2047.el (rfc2047-encode-region): Allow not folding the encoded words.
   (rfc2047-encode-string): Ditto.
   (rfc2047-encode-parameter): Don't fold parameters.  Some MUAs do not 
understand folded filename="..." parameters, for instance.
  gnus-agent.el (gnus-agent-auto-agentize-methods): Point to the Agent section 
in the manual.
modified:
  doc/misc/gnus.texi
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-agent.el
  lisp/gnus/rfc2047.el

=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi        2012-01-19 07:21:25 +0000
+++ b/doc/misc/gnus.texi        2012-01-30 23:30:22 +0000
@@ -18236,8 +18236,7 @@
 @kbd{J a} on the server (or servers) that you wish to have covered by the
 Agent (@pxref{Server Agent Commands}), or @kbd{J r} on automatically
 added servers you do not wish to have covered by the Agent.  By default,
-all @code{nntp} and @code{nnimap} servers in @code{gnus-select-method} and
address@hidden are agentized.
+no servers are agentized.
 
 @item
 Decide on download policy.  It's fairly simple once you decide whether
@@ -19263,7 +19262,7 @@
 as running @kbd{J a} on the servers (@pxref{Server Agent Commands}).
 If the file exist, you must manage the servers manually by adding or
 removing them, this variable is only applicable the first time you
-start Gnus.  The default is @samp{(nntp nnimap)}.
+start Gnus.  The default is @samp{nil}.
 
 @end table
 

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-01-30 22:03:11 +0000
+++ b/lisp/gnus/ChangeLog       2012-01-30 23:30:22 +0000
@@ -1,5 +1,16 @@
+2012-01-30  Philipp Haselwarter  <address@hidden>  (tiny change)
+
+       * gnus-agent.el (gnus-agent-auto-agentize-methods): Point to the Agent
+       section in the manual.
+
 2012-01-30  Lars Ingebrigtsen  <address@hidden>
 
+       * rfc2047.el (rfc2047-encode-region): Allow not folding the encoded
+       words.
+       (rfc2047-encode-string): Ditto.
+       (rfc2047-encode-parameter): Don't fold parameters.  Some MUAs do not
+       understand folded filename="..." parameters, for instance.
+
        * nnimap.el (nnimap-wait-for-response): Include the imap server name in
        the message for greater debuggability.
 

=== modified file 'lisp/gnus/gnus-agent.el'
--- a/lisp/gnus/gnus-agent.el   2012-01-19 07:21:25 +0000
+++ b/lisp/gnus/gnus-agent.el   2012-01-30 23:30:22 +0000
@@ -186,7 +186,7 @@
 (defcustom gnus-agent-auto-agentize-methods nil
   "Initially, all servers from these methods are agentized.
 The user may remove or add servers using the Server buffer.
-See Info node `(gnus)Server Buffer'."
+See Info nodes `(gnus)Server Buffer', `(gnus)Agent Variables'."
   :version "22.1"
   :type '(repeat symbol)
   :group 'gnus-agent)

=== modified file 'lisp/gnus/rfc2047.el'
--- a/lisp/gnus/rfc2047.el      2012-01-19 07:21:25 +0000
+++ b/lisp/gnus/rfc2047.el      2012-01-30 23:30:22 +0000
@@ -362,7 +362,7 @@
     (modify-syntax-entry ?@ "." table)
     table))
 
-(defun rfc2047-encode-region (b e)
+(defun rfc2047-encode-region (b e &optional dont-fold)
   "Encode words in region B to E that need encoding.
 By default, the region is treated as containing RFC2822 addresses.
 Dynamically bind `rfc2047-encoding-type' to change that."
@@ -546,16 +546,17 @@
                 (signal (car err) (cdr err))
               (error "Invalid data for rfc2047 encoding: %s"
                      (mm-replace-in-string orig-text "[ \t\n]+" " "))))))))
-    (rfc2047-fold-region b (point))
+    (unless dont-fold
+      (rfc2047-fold-region b (point)))
     (goto-char (point-max))))
 
-(defun rfc2047-encode-string (string)
+(defun rfc2047-encode-string (string &optional dont-fold)
   "Encode words in STRING.
 By default, the string is treated as containing addresses (see
 `rfc2047-encoding-type')."
   (mm-with-multibyte-buffer
     (insert string)
-    (rfc2047-encode-region (point-min) (point-max))
+    (rfc2047-encode-region (point-min) (point-max) dont-fold)
     (buffer-string)))
 
 ;; From RFC 2047:
@@ -850,7 +851,7 @@
 is the standard but many mailers don't support it."
   (let ((rfc2047-encoding-type 'mime)
        (rfc2047-encode-max-chars nil))
-    (rfc2045-encode-string param (rfc2047-encode-string value))))
+    (rfc2045-encode-string param (rfc2047-encode-string value t))))
 
 ;;;
 ;;; Functions for decoding RFC2047 messages