X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lisp%2Frfc2047.el;h=d3eb033523473178ca01a2d18d2fa21a99280a4f;hb=33bb7337c1d9482e730963cd66ea54d334d3a8c1;hp=ea36d60a60cbb0871f6efb7ed6c2244c1e81ac75;hpb=2ae065a564fc13c5fe890a40557e280d2aec06f4;p=elisp%2Fgnus.git-

diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el
index ea36d60..d3eb033 100644
--- a/lisp/rfc2047.el
+++ b/lisp/rfc2047.el
@@ -27,8 +27,8 @@
 (eval-and-compile
   (eval
    '(unless (fboundp 'base64-decode-string)
-      (autoload 'base64-decode-string "base64")
-      (autoload 'base64-encode-region "base64" nil t))))
+      (require 'base64))))
+
 (require 'qp)
 (require 'mm-util)
 (require 'ietf-drums)
@@ -129,7 +129,10 @@ Should be called narrowed to the head of the message."
 		  (rfc2047-encode-region (point-min) (point-max)))
 		 ;; Hm.
 		 (t))))
-	    (goto-char (point-max))))))))
+	    (goto-char (point-max)))))
+      (when rfc2047-default-charset
+	(encode-coding-region (point-min) (point-max)
+			      rfc2047-default-charset)))))
 
 (defun rfc2047-encodable-p ()
   "Say whether the current (narrowed) buffer contains characters that need encoding."