Update FSF's address.

[gnu-emacs] / lisp / mail / metamail.el

diff --git a/lisp/mail/metamail.el b/lisp/mail/metamail.el
index e37bd7b52e025444c738115fc0be844c868a18f2..0c5189e53e0553112140ee65010f55097eeb3776 100644 (file)
--- a/lisp/mail/metamail.el
+++ b/lisp/mail/metamail.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1993, 1996  Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@mse.kyutech.ac.jp>
-;; Version: $Id: metamail.el,v 1.9 1998/05/20 00:56:03 rms Exp fx $
 ;; Keywords: mail, news, mime, multimedia
 
 ;; This file is part of GNU Emacs.
@@ -20,28 +19,16 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; 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 +110,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 +150,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 (format "EMACS_VIEW_MODE=%d" 
+        (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 +189,5 @@ redisplayed as output is inserted."
 
 (provide 'metamail)
 
+;;; arch-tag: 52c0cb6f-d800-4776-9789-f0275cb5490e
 ;;; metamail.el ends here