[Emacs-diffs] /srv/bzr/emacs/trunk r99394: * mail/rmailmm.el (rmail-mime-handle): Don't set the buffer to unibyte

[Stefan Monnier]

------------------------------------------------------------
revno: 99394
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2010-01-22 11:43:54 -0500
message:
  * mail/rmailmm.el (rmail-mime-handle): Don't set the buffer to unibyte
  just because we see "encoding: 8bit".
  * mail/rmail.el (rmail-show-message-1): Decode the body's QP into bytes.
modified:
  lisp/ChangeLog
  lisp/mail/mail-utils.el
  lisp/mail/rmail.el
  lisp/mail/rmailmm.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-01-22 16:32:31 +0000
+++ b/lisp/ChangeLog    2010-01-22 16:43:54 +0000
@@ -1,3 +1,9 @@
+2010-01-22  Stefan Monnier  <address@hidden>
+
+       * mail/rmailmm.el (rmail-mime-handle): Don't set the buffer to unibyte
+       just because we see "encoding: 8bit".
+       * mail/rmail.el (rmail-show-message-1): Decode the body's QP into bytes.
+
 2010-01-22  Chong Yidong  <address@hidden>
 
        * isearch.el (isearch-allow-scroll): Doc fix (Bug#5446).

=== modified file 'lisp/mail/mail-utils.el'
--- a/lisp/mail/mail-utils.el   2010-01-13 08:35:10 +0000
+++ b/lisp/mail/mail-utils.el   2010-01-22 16:43:54 +0000
@@ -133,6 +133,8 @@
 If UNIBYTE is non-nil, insert converted characters as unibyte.
 That is useful if you are going to character code decoding afterward,
 as Rmail does."
+  ;; FIXME: `unibyte' should always be non-nil, and the iso-latin-1
+  ;; specific handling should be removed (or moved elsewhere and generalized).
   (interactive "r\nP")
   (let (failed)
     (save-match-data

=== modified file 'lisp/mail/rmail.el'
--- a/lisp/mail/rmail.el        2010-01-13 12:34:53 +0000
+++ b/lisp/mail/rmail.el        2010-01-22 16:43:54 +0000
@@ -2727,7 +2727,8 @@
            (insert-buffer-substring mbox-buf body-start end)
            (cond
             ((string= character-coding "quoted-printable")
-             (mail-unquote-printable-region (point-min) (point-max)))
+             (mail-unquote-printable-region (point-min) (point-max)
+                                             nil nil 'unibyte))
             ((and (string= character-coding "base64") is-text-message)
              (base64-decode-region (point-min) (point-max)))
             ((eq character-coding 'uuencode)

=== modified file 'lisp/mail/rmailmm.el'
--- a/lisp/mail/rmailmm.el      2010-01-13 08:35:10 +0000
+++ b/lisp/mail/rmailmm.el      2010-01-22 16:43:54 +0000
@@ -361,7 +361,10 @@
         (setq content-transfer-encoding nil))
        ((string= content-transfer-encoding "8bit")
         ;; FIXME: Is this the correct way?
-        (set-buffer-multibyte nil)))
+         ;; No, of course not, it just means there's no decoding to do.
+        ;; (set-buffer-multibyte nil)
+         (setq content-transfer-encoding nil)
+         ))
   ;; Inline stuff requires work.  Attachments are handled by the bulk
   ;; handler.
   (if (string= "inline" (car content-disposition))