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.

3 files changed, 18 insertions, 6 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 93ceeebf0c..1d99418ed2 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,16 @@
+2012-01-30  Philipp Haselwarter  <[email protected]>  (tiny change)
+
+	* gnus-agent.el (gnus-agent-auto-agentize-methods): Point to the Agent
+	section in the manual.
+
 2012-01-30  Lars Ingebrigtsen  <[email protected]>
 
+	* 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.
 
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index 70772bb1d0..d730875886 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -186,7 +186,7 @@ When found, offer to remove them."
 (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)
diff --git a/lisp/gnus/rfc2047.el b/lisp/gnus/rfc2047.el
index a275df7701..e881256f38 100644
--- a/lisp/gnus/rfc2047.el
+++ b/lisp/gnus/rfc2047.el
@@ -362,7 +362,7 @@ The buffer may be narrowed."
     (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 @@ Dynamically bind `rfc2047-encoding-type' to change that."
 		 (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 @@ This is a substitution for the `rfc2231-encode-string' function, that
 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