Sync up with main trunc.

diff --git a/ChangeLog b/ChangeLog
index 77843e4..c563477 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1998-04-23  Shuhei KOBAYASHI  <shuhei-k@jaist.ac.jp>
+
+       * eword-decode.el (eword-decode-ignored-field-list): Add
+       `received'.
+       
+       * mel.el (mime-temp-directory): Use TMPDIR, TMP, or TEMP
+       environment variables.
+
 1998-04-23  Tanaka Akira  <akr@jaist.ac.jp>
 
        * eword-decode.el (eword-encoded-word-prefix-regexp): New constant.

diff --git a/eword-decode.el b/eword-decode.el
index 9b87b82..65ae6b5 100644 (file)
--- a/eword-decode.el
+++ b/eword-decode.el
@@ -357,7 +357,7 @@ such as a version of Net$cape)."
 ;;;
 
 (defcustom eword-decode-ignored-field-list
-  '(newsgroups path lines nntp-posting-host message-id date)
+  '(newsgroups path lines nntp-posting-host received message-id date)
   "*List of field-names to be ignored when decoding.
 Each field name must be symbol."
   :group 'eword-decode

diff --git a/mel.el b/mel.el
index 9cc504e..be8a26f 100644 (file)
--- a/mel.el
+++ b/mel.el
@@ -36,6 +36,9 @@
 
 (defvar mime-temp-directory (or (getenv "MIME_TMP_DIR")
                                (getenv "TM_TMP_DIR")
+                               (getenv "TMPDIR")
+                               (getenv "TMP")
+                               (getenv "TEMP")
                                "/tmp/")
   "*Directory for temporary files.")