Merge from emacs-23

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

diff --git a/lisp/mail/binhex.el b/lisp/mail/binhex.el
index 13738f0c0a9c5dcd02f0fdb560394a2603393b25..3f0a9dbffbda96dbbafb2b0dc5fe77affac52371 100644 (file)
--- a/lisp/mail/binhex.el
+++ b/lisp/mail/binhex.el
@@ -226,7 +226,8 @@ If HEADER-ONLY is non-nil only decode header and return filename."
          (goto-char start)
          (when (re-search-forward binhex-begin-line end t)
             (setq work-buffer (generate-new-buffer " *binhex-work*"))
-            (with-current-buffer work-buffer (set-buffer-multibyte nil))
+           (unless (featurep 'xemacs)
+             (with-current-buffer work-buffer (set-buffer-multibyte nil)))
            (beginning-of-line)
            (setq bits 0 counter 0)
            (while tmp
@@ -332,5 +333,4 @@ If HEADER-ONLY is non-nil only decode header and return filename."
 
 (provide 'binhex)
 
-;; arch-tag: 8476badd-1e76-4f1d-a640-f9a38c72eed8
 ;;; binhex.el ends here