[Emacs-diffs] Changes to emacs/lisp/mail/metamail.el

[Juanma Barranquero]

Index: emacs/lisp/mail/metamail.el
diff -c emacs/lisp/mail/metamail.el:1.14 emacs/lisp/mail/metamail.el:1.15
*** emacs/lisp/mail/metamail.el:1.14    Sat Nov 11 19:22:02 2000
--- emacs/lisp/mail/metamail.el Tue Feb  4 08:14:00 2003
***************
*** 3,9 ****
  ;; Copyright (C) 1993, 1996  Free Software Foundation, Inc.
  
  ;; Author: Masanobu UMEDA <address@hidden>
! ;; Version: $Id: metamail.el,v 1.14 2000/11/12 00:22:02 fx Exp $
  ;; Keywords: mail, news, mime, multimedia
  
  ;; This file is part of GNU Emacs.
--- 3,9 ----
  ;; Copyright (C) 1993, 1996  Free Software Foundation, Inc.
  
  ;; Author: Masanobu UMEDA <address@hidden>
! ;; Version: $Id: metamail.el,v 1.15 2003/02/04 13:14:00 lektu Exp $
  ;; Keywords: mail, news, mime, multimedia
  
  ;; This file is part of GNU Emacs.
***************
*** 111,119 ****
        ;; Find Content-Type and Content-Transfer-Encoding from the header.
        (save-restriction
        (narrow-to-region (point-min) end)
!       (setq contype 
              (or (mail-fetch-field "Content-Type") "text/plain"))
!       (setq encoding 
              (or (mail-fetch-field "Content-Transfer-Encoding") "7bit")))
        ;; Interpret the body part only.
        (let ((metamail-switches                ;Process body part only.
--- 111,119 ----
        ;; Find Content-Type and Content-Transfer-Encoding from the header.
        (save-restriction
        (narrow-to-region (point-min) end)
!       (setq contype
              (or (mail-fetch-field "Content-Type") "text/plain"))
!       (setq encoding
              (or (mail-fetch-field "Content-Transfer-Encoding") "7bit")))
        ;; Interpret the body part only.
        (let ((metamail-switches                ;Process body part only.
***************
*** 153,159 ****
        (buffer-read-only nil)
        (metafile (make-temp-file "metamail"))
        (option-environment
!        (list (format "EMACS_VIEW_MODE=%d" 
                       (if (numberp viewmode) viewmode 1)))))
      (save-excursion
        ;; Gee!  Metamail does not ouput to stdout if input comes from
--- 153,159 ----
        (buffer-read-only nil)
        (metafile (make-temp-file "metamail"))
        (option-environment
!        (list (format "EMACS_VIEW_MODE=%d"
                       (if (numberp viewmode) viewmode 1)))))
      (save-excursion
        ;; Gee!  Metamail does not ouput to stdout if input comes from