(uudecode-decode-region-internal): Use set-buffer-multibyte rather than

setting default-enable-multibyte-characters.

2 files changed, 7 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2c0be4b6a91..73e7f027479 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,6 @@
 2008-03-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * mail/uudecode.el (uudecode-decode-region-internal):
         * net/dns.el (dns-read-string-name, dns-read, dns-read-type, query-dns):
         * sha1.el (sha1-string-external): Use set-buffer-multibyte rather than
         setting default-enable-multibyte-characters.
diff --git a/lisp/mail/uudecode.el b/lisp/mail/uudecode.el
index 574ad0e785c..ff238fae58a 100644
--- a/lisp/mail/uudecode.el
+++ b/lisp/mail/uudecode.el
@@ -217,14 +217,14 @@ If FILE-NAME is non-nil, save the result to FILE-NAME."
                           result))))
           (skip-chars-forward non-data-chars end))
         (if file-name
-            (let (default-enable-multibyte-characters)
-              (with-temp-file file-name
-                (insert (apply 'concat (nreverse result)))))
+            (with-temp-file file-name
+              (set-buffer-multibyte nil)
+              (insert (apply 'concat (nreverse result))))
           (or (markerp end) (setq end (set-marker (make-marker) end)))
           (goto-char start)
           (if enable-multibyte-characters
-              (mapc #'(lambda (x) (insert (uudecode-string-to-multibyte x)))
-                    (nreverse result))
+              (dolist (x (nreverse result))
+                (insert (uudecode-string-to-multibyte x)))
             (insert (apply 'concat (nreverse result))))
           (delete-region (point) end))))))
 
@@ -238,5 +238,5 @@ If FILE-NAME is non-nil, save the result to FILE-NAME."
 
 (provide 'uudecode)
 
-;;; arch-tag: e1f09ed5-62b4-4677-9f13-4e81c4fe8ce3
+;; arch-tag: e1f09ed5-62b4-4677-9f13-4e81c4fe8ce3
 ;;; uudecode.el ends here