Synch to No Gnus 200406240648.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 627bad4..f9e7927 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,10 @@
 2004-06-24  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-       * rfc2047.el (rfc2047-encode-region): Move point to the end of the
-       region after encoding.
-       Suggested by IRIE Tetsuya <irie@t.email.ne.jp>.
+       * mm-util.el (mm-with-multibyte-buffer): New macro.
+
+       * rfc2047.el (rfc2047-encode-string): Use it.
+       (rfc2047-encode-region): Move point to the end of the region after
+       encoding.  Suggested by IRIE Tetsuya <irie@t.email.ne.jp>.
 
 2004-06-23  Katsumi Yamaoka  <yamaoka@jpl.org>
 

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index a09de2b..6bcc05f 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -612,6 +612,14 @@ Use unibyte mode for this."
 (put 'mm-with-unibyte-buffer 'lisp-indent-function 0)
 (put 'mm-with-unibyte-buffer 'edebug-form-spec '(body))
 
+(defmacro mm-with-multibyte-buffer (&rest forms)
+  "Create a temporary buffer, and evaluate FORMS there like `progn'.
+Use multibyte mode for this."
+  `(let ((default-enable-multibyte-characters t))
+     (with-temp-buffer ,@forms)))
+(put 'mm-with-multibyte-buffer 'lisp-indent-function 0)
+(put 'mm-with-multibyte-buffer 'edebug-form-spec '(body))
+
 (defmacro mm-with-unibyte-current-buffer (&rest forms)
   "Evaluate FORMS with current buffer temporarily made unibyte.
 Also bind `default-enable-multibyte-characters' to nil.

diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el
index a6c071d..3b76718 100644 (file)
--- a/lisp/rfc2047.el
+++ b/lisp/rfc2047.el
@@ -438,7 +438,7 @@ Dynamically bind `rfc2047-encoding-type' to change that."
   "Encode words in STRING.
 By default, the string is treated as containing addresses (see
 `rfc2047-encoding-type')."
-  (with-temp-buffer
+  (mm-with-multibyte-buffer
     (insert string)
     (rfc2047-encode-region (point-min) (point-max))
     (buffer-string)))