Sync up with the latest semi-1_10.

diff --git a/ChangeLog b/ChangeLog
index 468daa5..5d2c232 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1998-10-24  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-play.el, mime-pgp.el, mime-partial.el, mime-image.el,
+       mime-edit.el: Use `temporary-file-directory' instead of
+       `mime-temp-directory'.
+
+\f
 1998-10-23  Katsumi Yamaoka   <yamaoka@jpl.org>
 
        * WEMI: Version 1.10.0 (Shin-Kambara) released.

diff --git a/VERSION b/VERSION
index 09b16cd..781313f 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -68,7 +68,7 @@
 1.9.0  Isurugi                 \e$(B@PF0\e(B
 1.9.1  Kurikara                \e$(B6fMx2@Me\e(B
 1.10.0 Tsubata                 \e$(BDEH(\e(B
------  Morimoto                \e$(B?9K\\e(B
+1.10.1 Morimoto                \e$(B?9K\\e(B
 -------        Higashi-Kanazawa        \e$(BEl6bBt\e(B
 -------        Kanazawa                \e$(B6bBt\e(B             ; <=> \e$(BKLN&E4F;\e(B \e$(BKLE46bBt\e(B
 -------        Nishi-Kanazawa          \e$(B@>6bBt\e(B           ; <=> \e$(BKLN&E4F;\e(B \e$(B?7@>6bBt\e(B
@@ -129,7 +129,7 @@
 1.9.0  Fuji                    \e$(BIY;N\e(B     ; = JR \e$(B?H1d@~\e(B
 1.9.1  Fujikawa                \e$(BIY;N@n\e(B
 1.10.0 Shin-Kambara            \e$(B?73w86\e(B
------- Kambara                 \e$(B3w86\e(B
+1.10.1 Kambara                 \e$(B3w86\e(B
 ------ Yui                     \e$(BM3Hf\e(B
 ------ Okitsu                  \e$(B6=DE\e(B
 ------ Shimizu                 \e$(B@6?e\e(B

diff --git a/mime-edit.el b/mime-edit.el
index 2187b32..709c093 100644 (file)
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -2413,7 +2413,7 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
   (let* ((mime-edit-draft-file-name
          (or (buffer-file-name)
              (make-temp-name
-              (expand-file-name "mime-draft" mime-temp-directory))))
+              (expand-file-name "mime-draft" temporary-file-directory))))
         (separator mail-header-separator)
         (id (concat "\""
                     (replace-space-with-underline (current-time-string))

diff --git a/mime-image.el b/mime-image.el
index 1e20ac0..d5e4aa0 100644 (file)
--- a/mime-image.el
+++ b/mime-image.el
@@ -146,7 +146,7 @@
          ((eq (aref gl 0) 'xbm)
           (let ((xbm-file
                  (make-temp-name
-                  (expand-file-name "tm" mime-temp-directory))))
+                  (expand-file-name "tm" temporary-file-directory))))
             (with-temp-buffer
               (insert (aref gl 2))
               (write-region (point-min)(point-max) xbm-file)

diff --git a/mime-partial.el b/mime-partial.el
index f5378eb..e085eab 100644 (file)
--- a/mime-partial.el
+++ b/mime-partial.el
@@ -39,7 +39,8 @@ partial messages using mime-view."
         (subject-buf (eval (cdr (assq 'summary-buffer-exp situation))))
         subject-id
         (root-dir (expand-file-name
-                   (concat "m-prts-" (user-login-name)) mime-temp-directory))
+                   (concat "m-prts-" (user-login-name))
+                   temporary-file-directory))
         (request-partial-message-method
          (cdr (assq 'request-partial-message-method situation)))
         full-file)

diff --git a/mime-pgp.el b/mime-pgp.el
index 67fbb6e..0facca0 100644 (file)
--- a/mime-pgp.el
+++ b/mime-pgp.el
@@ -166,7 +166,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
                   (1- knum)
                 (1+ knum)))
         (orig-entity (nth onum (mime-entity-children mother)))
-        (basename (expand-file-name "tm" mime-temp-directory))
+        (basename (expand-file-name "tm" temporary-file-directory))
         (orig-file (make-temp-name basename))
         (sig-file (concat orig-file ".sig"))
         )

diff --git a/mime-play.el b/mime-play.el
index 4772f9a..11f904b 100644 (file)
--- a/mime-play.el
+++ b/mime-play.el
@@ -324,9 +324,9 @@ specified, play as it.  Default MODE is \"play\"."
              (name (mime-entity-safe-filename entity)))
          (setq name
                (if (and name (not (string= name "")))
-                   (expand-file-name name mime-temp-directory)
+                   (expand-file-name name temporary-file-directory)
                  (make-temp-name
-                  (expand-file-name "EMI" mime-temp-directory))
+                  (expand-file-name "EMI" temporary-file-directory))
                  ))
           (mime-write-entity-content entity name)
          (message "External method is starting...")
@@ -543,7 +543,7 @@ It is registered to variable `mime-preview-quitting-method-alist'."
   (goto-char (mime-entity-point-min entity))
   (let* ((root-dir
          (expand-file-name
-          (concat "m-prts-" (user-login-name)) mime-temp-directory))
+          (concat "m-prts-" (user-login-name)) temporary-file-directory))
         (id (cdr (assoc "id" cal)))
         (number (cdr (assoc "number" cal)))
         (total (cdr (assoc "total" cal)))

diff --git a/semi-def.el b/semi-def.el
index 3376372..8307320 100644 (file)
--- a/semi-def.el
+++ b/semi-def.el
@@ -30,7 +30,7 @@
 
 (require 'custom)
 
-(defconst mime-user-interface-product '["WEMI" (1 10 0) "Shin-Kambara"]
+(defconst mime-user-interface-product '["WEMI" (1 10 1) "Kambara"]
   "Implementation name, version name and numbers of MIME-kernel package.")
 
 (autoload 'mule-caesar-region "mule-caesar"