X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/5ab5daada52deee23328438772b14b3f9c150a77..37ec692a024d538a1c913c310b71e8e8f32ee1ad:/lisp/mail/metamail.el

diff --git a/lisp/mail/metamail.el b/lisp/mail/metamail.el
index d838762fdc..d64616dba8 100644
--- a/lisp/mail/metamail.el
+++ b/lisp/mail/metamail.el
@@ -1,9 +1,9 @@
 ;;; metamail.el --- Metamail interface for GNU Emacs
 
-;; Copyright (C) 1993, 1996  Masanobu UMEDA
+;; Copyright (C) 1993, 1996  Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@mse.kyutech.ac.jp>
-;; Version: $Id: metamail.el,v 1.7 1997/05/05 11:51:44 rms Exp rms $
+;; 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.
@@ -25,23 +25,11 @@
 
 ;;; Commentary:
 
-;; The latest version will be at:
-;;	ftp://ftp.kyutech.ac.jp/pub/MultiMedia/mime/emacs-mime-tools.shar
-
-;; Note: Metamail does not have all options which is compatible with
-;; the environment variables.  For that reason, matamail.el have to
+;; Note: Metamail does not have all the options which are compatible with
+;; the environment variables.  For that reason, metamail.el has to
 ;; hack the environment variables.  In addition, there is no way to
 ;; display all header fields without extra informative body messages
-;; which are suppressed by "-q" option.
-
-;; The following definition is what I'm using with GNUS 4:
-;;(setq gnus-show-mime-method
-;;      (function
-;;       (lambda ()
-;;	   (metamail-interpret-header)
-;;	   (let ((metamail-switches	;Suppress header fields in a body.
-;;		  (append metamail-switches '("-q"))))
-;;	     (metamail-interpret-body)))))
+;; which are suppressed by the "-q" option.
 
 ;; The idea of using metamail to process MIME messages is from
 ;; gnus-mime.el by Spike <Spike@world.std.com>.
@@ -123,9 +111,9 @@ Its header part is not interpreted at all."
       ;; Find Content-Type and Content-Transfer-Encoding from the header.
       (save-restriction
 	(narrow-to-region (point-min) end)
-	(setq contype 
+	(setq contype
 	      (or (mail-fetch-field "Content-Type") "text/plain"))
-	(setq encoding 
+	(setq encoding
 	      (or (mail-fetch-field "Content-Transfer-Encoding") "7bit")))
       ;; Interpret the body part only.
       (let ((metamail-switches		;Process body part only.
@@ -163,9 +151,9 @@ redisplayed as output is inserted."
   (interactive "r\np")
   (let ((curbuf (current-buffer))
 	(buffer-read-only nil)
-	(metafile (make-temp-name "/tmp/metamail"))
+	(metafile (make-temp-file "metamail"))
 	(option-environment
-	 (list (concat "EMACS_VIEW_MODE=" 
+	 (list (format "EMACS_VIEW_MODE=%d"
 		       (if (numberp viewmode) viewmode 1)))))
     (save-excursion
       ;; Gee!  Metamail does not ouput to stdout if input comes from
@@ -202,4 +190,5 @@ redisplayed as output is inserted."
 
 (provide 'metamail)
 
+;;; arch-tag: 52c0cb6f-d800-4776-9789-f0275cb5490e
 ;;; metamail.el ends here