(rmail-mime): Decode in fundamental-mode. (Bug#4993)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ba2f222cf8f5bd3a3de1de24abfcfb0624eec905..365442c2a62e6dca47cf950c04f1f0445e5e5ce0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-21  Glenn Morris  <rgm@gnu.org>
+
+       * mail/rmailmm.el (rmail-mime): Decode in fundamental-mode.  (Bug#4993)
+
 2009-11-20  Ken Brown  <kbrown@cornell.edu>  (tiny change)
 
        * net/browse-url.el (browse-url-default-windows-browser): Use

diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index 29aa869523e79dbcbbd1fdeb2323d1f6ecd26ce7..41704cf5187393868b6e8adc386380d1c0a2f8f1 100644 (file)
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -451,10 +451,14 @@ attachments as specfied by `rmail-mime-attachment-dirs-alist'."
     (set-buffer buf)
     (setq buffer-undo-list t)
     (let ((inhibit-read-only t))
+      ;; Decoding the message in fundamental mode for speed, only
+      ;; switching to rmail-mime-mode at the end for display.  Eg
+      ;; quoted-printable-decode-region gets very slow otherwise (Bug#4993).
+      (fundamental-mode)
       (erase-buffer)
       (insert data)
-      (rmail-mime-mode)
       (rmail-mime-show t)
+      (rmail-mime-mode)
       (set-buffer-modified-p nil))
     (view-buffer buf)))