* mm-util.el (mm-find-buffer-file-coding-system):

* yenc.el (yenc-decode-region): Don't let-bind a read-only variable.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index f07f0da6253c5ff5f22d4d554baff8c4c86e4421..b7ef5824772cec46e017785fa37d82cc0300140e 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * mm-util.el (mm-find-buffer-file-coding-system):
+       * yenc.el (yenc-decode-region): Don't let-bind a read-only variable.
+
 2010-04-22  Andreas Seltenreich  <seltenreich@gmx.de>
 
        * message.el (message-generate-headers): Record insertion of optional

diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index aa2be153b0f95f0d1e7adc1be594c2ba81582249..1e70a69b1fd95b26491f475ad2970d0cd49287ef 100644 (file)
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -1239,6 +1239,9 @@ worth using this macro in unibyte buffers of course).  Use of
 harmful since it is likely to modify existing data in the buffer.
 For instance, it converts \"\\300\\255\" into \"\\255\" in
 Emacs 23 (unicode)."
+  ;; FIXME: (default-value 'enable-multibyte-characters) is read-only
+  ;; so let-binding it is wrong.  The right fix is to not use this
+  ;; macro at all any more, since it's been ill-defined from the start.
   (let ((multibyte (make-symbol "multibyte"))
        (buffer (make-symbol "buffer")))
     `(if mm-emacs-mule
@@ -1593,8 +1596,8 @@ gzip, bzip2, etc. are allowed."
                            filename))
                    (mm-decompress-buffer filename nil t))))
       (when decomp
-       (set-buffer (letf (((default-value 'enable-multibyte-characters) nil))
-                         (generate-new-buffer " *temp*")))
+       (set-buffer (generate-new-buffer " *temp*"))
+        (mm-disable-multibyte)
        (insert decomp)
        (setq filename (file-name-sans-extension filename)))
       (goto-char (point-min))

diff --git a/lisp/gnus/yenc.el b/lisp/gnus/yenc.el
index b0f7b4115b23b81320ddb1bfeb77218dd37a2ee5..8cb522c4ec707a4a4b3d3c45c56a430e8de1e90e 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*")))
+                (with-current-buffer
+                    (setq work-buffer (generate-new-buffer " *yenc-work*"))
+                  (set-buffer-multibyte nil))
                (while (< first last)
                  (setq char (char-after first))
                  (cond ((or (eq char ?\r)