Merge from emacs-23

[gnu-emacs] / lisp / mail / uudecode.el

diff --git a/lisp/mail/uudecode.el b/lisp/mail/uudecode.el
index 22b97b4b7bb4b81d5512bc63651e9e59733b869b..90fcbccc7fc79db4a7e385066c6a06fbc51ef8a5 100644 (file)
--- a/lisp/mail/uudecode.el
+++ b/lisp/mail/uudecode.el
@@ -216,7 +216,7 @@ If FILE-NAME is non-nil, save the result to FILE-NAME."
          (skip-chars-forward non-data-chars end))
        (if file-name
             (with-temp-file file-name
-              (set-buffer-multibyte nil)
+              (unless (featurep 'xemacs) (set-buffer-multibyte nil))
               (insert (apply 'concat (nreverse result))))
          (or (markerp end) (setq end (set-marker (make-marker) end)))
          (goto-char start)
@@ -236,5 +236,4 @@ If FILE-NAME is non-nil, save the result to FILE-NAME."
 
 (provide 'uudecode)
 
-;; arch-tag: e1f09ed5-62b4-4677-9f13-4e81c4fe8ce3
 ;;; uudecode.el ends here