From: yamaoka <yamaoka>
Date: Fri, 23 Jul 2004 08:42:51 +0000 (+0000)
Subject: Synch to No Gnus 200407230842.
X-Git-Tag: t-gnus-6_17_4-quimby-~818
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=49904df12a9d514a2ee05564c1491c952d374b48;p=elisp%2Fgnus.git-

Synch to No Gnus 200407230842.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3f8dbde..6017c7b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* rfc2047.el (rfc2047-encode-region): Fix last change.
+	(rfc2047-encode-parameter): Remove useless concat.
+
 2004-07-22  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* rfc2047.el (rfc2047-encode-region): Check carefully whether to
diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el
index ac892ee..46ee8be 100644
--- a/lisp/rfc2047.el
+++ b/lisp/rfc2047.el
@@ -409,6 +409,7 @@ Dynamically bind `rfc2047-encoding-type' to change that."
 				      (while (re-search-forward
 					      encodable-regexp end t))
 				      (< begin (point)))
+				    (goto-char begin)
 				    (or (not (re-search-forward "\\Sw" end t))
 					(progn
 					  (goto-char (match-beginning 0))
@@ -717,7 +718,7 @@ it, put the following line in your ~/.gnus.el file:
 	 (string (rfc2047-encode-string value)))
     (if (string-match "[][()<>@,;:\\\"/?=]" ;; tspecials
 		      string)
-	(concat param "=" (format "%S" string))
+	(format "%s=%S" param string)
       (concat param "=" string))))
 
 ;;;