[Emacs-diffs] Changes to emacs/lisp/mh-e/mh-mime.el

[Miles Bader]

Index: emacs/lisp/mh-e/mh-mime.el
diff -c emacs/lisp/mh-e/mh-mime.el:1.1 emacs/lisp/mh-e/mh-mime.el:1.2
*** emacs/lisp/mh-e/mh-mime.el:1.1      Sat Jan 25 21:38:37 2003
--- emacs/lisp/mh-e/mh-mime.el  Mon Feb  3 15:55:30 2003
***************
*** 32,38 ****
  
  ;;; Change Log:
  
! ;; $Id: mh-mime.el,v 1.1 2003/01/26 02:38:37 wohler Exp $
  
  ;;; Code:
  
--- 32,38 ----
  
  ;;; Change Log:
  
! ;; $Id: mh-mime.el,v 1.2 2003/02/03 20:55:30 wohler Exp $
  
  ;;; Code:
  
***************
*** 787,793 ****
            (setq handles pre-dissected-handles)
          (setq handles (or (mm-dissect-buffer nil) (mm-uu-dissect)))
          (setf (mh-mime-handles (mh-buffer-data))
!               (mm-merge-handles handles (mh-mime-handles (mh-buffer-data)))))
  
        (when (and handles (or (not (stringp (car handles))) (cdr handles)))
          ;; Goto start of message body
--- 787,802 ----
            (setq handles pre-dissected-handles)
          (setq handles (or (mm-dissect-buffer nil) (mm-uu-dissect)))
          (setf (mh-mime-handles (mh-buffer-data))
!               (mm-merge-handles handles (mh-mime-handles (mh-buffer-data))))
! 
!         ;; Use charset to decode body...
!         (unless handles
!           (let* ((ct (ignore-errors
!                        (mail-header-parse-content-type
!                         (message-fetch-field "Content-Type" t))))
!                  (charset (mail-content-type-get ct 'charset)))
!             (when (stringp charset)
!               (mm-decode-body charset)))))
  
        (when (and handles (or (not (stringp (car handles))) (cdr handles)))
          ;; Goto start of message body
***************
*** 1215,1228 ****
  The function decodes the message and displays it. It avoids decoding the same
  message multiple times."
    (let ((b (point))
-         (charset (mail-content-type-get (mm-handle-type handle) 'charset))
          (clean-message-header mh-clean-message-header-flag)
          (invisible-headers mh-invisible-headers)
          (visible-headers mh-visible-headers))
-     (when (and charset (stringp charset))
-       (setq charset (intern (downcase charset)))
-       (when (eq charset 'us-ascii)
-         (setq charset nil)))
      (save-excursion
        (save-restriction
          (narrow-to-region b b)
--- 1224,1232 ----