[Emacs-diffs] /srv/bzr/emacs/trunk r100009: * mm-util.el (mm-find-buffer-file-coding-system):

[Stefan Monnier]

------------------------------------------------------------
revno: 100009
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2010-04-23 12:15:51 -0400
message:
  * mm-util.el (mm-find-buffer-file-coding-system): 
  * yenc.el (yenc-decode-region): Don't let-bind a read-only variable.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/mm-util.el
  lisp/gnus/yenc.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-04-22 08:24:25 +0000
+++ b/lisp/gnus/ChangeLog       2010-04-23 16:15:51 +0000
@@ -1,3 +1,8 @@
+2010-04-23  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
        * message.el (message-generate-headers): Record insertion of optional

=== modified file 'lisp/gnus/mm-util.el'
--- a/lisp/gnus/mm-util.el      2010-03-15 01:38:28 +0000
+++ b/lisp/gnus/mm-util.el      2010-04-23 16:15:51 +0000
@@ -1239,6 +1239,9 @@
 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 @@
                            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))

=== modified file 'lisp/gnus/yenc.el'
--- a/lisp/gnus/yenc.el 2010-01-13 08:35:10 +0000
+++ b/lisp/gnus/yenc.el 2010-04-23 16:15:51 +0000
@@ -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)