(comint-postoutput-scroll-to-bottom): Cope with unset

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

diff --git a/lisp/mail/metamail.el b/lisp/mail/metamail.el
index c72cef5d6a58e40d6ad47485507ca1bbea78e8c6..e37bd7b52e025444c738115fc0be844c868a18f2 100644 (file)
--- 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.6 1997/05/05 05:45:46 eggert Exp rms $
+;; 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.
@@ -165,15 +165,12 @@ redisplayed as output is inserted."
        (buffer-read-only nil)
        (metafile (make-temp-name "/tmp/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
       ;; stdin.
-      (let ((selective-display nil)    ;Disable ^M to nl translation.
-           (kanji-fileio-code 2)       ;Write in JIS code when nemacs.
-           (file-coding-system         ;Write in JUNET style when mule.
-            (if (featurep 'mule) *junet*)))
+      (let ((selective-display nil))   ;Disable ^M to nl translation.
        (write-region beg end metafile nil 'nomessage))
       (if buffer
          (set-buffer buffer))
@@ -187,12 +184,8 @@ redisplayed as output is inserted."
       ;; to pass such information directly.
       (let ((process-environment
             (append process-environment
-                    metamail-environment option-environment)))
-       ;; Specify character coding system.
-       (if (boundp 'NEMACS)
-           (define-program-kanji-code nil metamail-program-name 2)) ;JIS
-       (if (featurep 'mule)
-           (define-program-coding-system nil metamail-program-name *junet*))
+                    metamail-environment option-environment))
+           (coding-system-for-read 'undecided))
        (apply (function call-process)
               metamail-program-name
               nil