Merge from emacs-23

[gnu-emacs] / lisp / gnus / yenc.el

diff --git a/lisp/gnus/yenc.el b/lisp/gnus/yenc.el
index c31f59c64e46ddf1658d7c95a65eb836be9532fc..0c8759791f1a7acea21f99e2e30b93adaf9ea0ce 100644 (file)
--- a/lisp/gnus/yenc.el
+++ b/lisp/gnus/yenc.el
@@ -89,8 +89,9 @@
              (when (re-search-forward "^=yend.*$" end t)
                (setq last (match-beginning 0))
                (setq footer-alist (yenc-parse-line (match-string 0)))
-               (letf (((default-value 'enable-multibyte-characters) nil))
-                     (setq work-buffer (generate-new-buffer " *yenc-work*")))
+               (setq work-buffer (generate-new-buffer " *yenc-work*"))
+               (unless (featurep 'xemacs)
+                 (with-current-buffer work-buffer (set-buffer-multibyte nil)))
                (while (< first last)
                  (setq char (char-after first))
                  (cond ((or (eq char ?\r)
@@ -135,5 +136,4 @@
 
 (provide 'yenc)
 
-;; arch-tag: 74df17e8-6fa8-4071-9f7d-54d548d79d9a
 ;;; yenc.el ends here