From: akr <akr>
Date: Wed, 13 May 1998 10:12:05 +0000 (+0000)
Subject: Sync up with flim-1_2_0 to flim-1_2_1
X-Git-Tag: flam-1_2_1~1
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=3b0f471b1530aadd6e2cbe01e0e8d79a05e43a3b;p=elisp%2Fflim.git

Sync up with flim-1_2_0 to flim-1_2_1
---

diff --git a/ChangeLog b/ChangeLog
index 4f03a87..e9cebf2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1998-05-13  Tanaka Akira  <akr@jaist.ac.jp>
+
+	* Sync up with flim-1_2_0 to flim-1_2_1.
+
 1998-05-08  Tanaka Akira  <akr@jaist.ac.jp>
 
 	* Sync up with flim-1_1_0 to flim-1_2_0.
@@ -88,9 +92,23 @@
 
 	* Sync up with flim-1_0_0 to flim-1_0_1.
 
+1998-05-09  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* FLIM: Version 1.2.1 (Kamitobaguchi) was released.
+
+1998-05-09  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* mel-q.el (quoted-printable-internal-decode-region): Use
+	'string-as-multibyte to avoid problem in Emacs 20.3.
+
+1998-05-08  Katsumi Yamaoka   <yamaoka@jpl.org>
+
+	* mel-u.el: Use mime-temp-directory instead of TMP.
+
+
 1998-05-06  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-	* FLIM: Version 1.2.0 (J-Dþjò) was released.-A
+	* FLIM: Version 1.2.0 (J-Dþjò)-A was released.
 
 	* README.en (What's FLIM): Delete description about
  	std11-parse.el; add description about mailcap.el.
@@ -141,7 +159,7 @@
 
 1998-05-05  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-	* FLIM: Version 1.1.0 (T-Dòji) was released.-A
+	* FLIM: Version 1.1.0 (T-Dòji)-A was released.
 
 1998-05-04  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -177,7 +195,7 @@
 
 1998-04-17  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-	* FLIM: Version 1.0.1 (Ky-Dòto) was released.-A
+	* FLIM: Version 1.0.1 (Ky-Dòto)-A was released.
 
 	* mime-def.el (mime-spadework-module-version-string): New
  	constant.
diff --git a/Makefile b/Makefile
index a40664c..d550eec 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # Makefile for FLIM.
 #
 
-VERSION = 1.2.0
+VERSION = 1.2.1
 
 TAR	= tar
 RM	= /bin/rm -f
diff --git a/mel-q.el b/mel-q.el
index 9a8f954..6ec4f0b 100644
--- a/mel-q.el
+++ b/mel-q.el
@@ -202,7 +202,7 @@ It calls external quoted-printable encoder specified by
 	  (setq e (match-end 0))
 	  (setq str (buffer-substring b e))
 	  (delete-region b e)
-	  (insert (quoted-printable-decode-string str))
+	  (insert (string-as-multibyte (quoted-printable-decode-string str)))
 	  ))
       )))
 
diff --git a/mel-u.el b/mel-u.el
index 46e9efa..d004d60 100644
--- a/mel-u.el
+++ b/mel-u.el
@@ -35,8 +35,7 @@
 (defvar uuencode-external-encoder '("uuencode" "-")
   "*list of uuencode encoder program name and its arguments.")
 
-(defvar uuencode-external-decoder
-  (list "sh" "-c" (format "(cd %s; uudecode)" mime-temp-directory))
+(defvar uuencode-external-decoder '("sh" "-c" "uudecode")
   "*list of uuencode decoder program name and its arguments.")
 
 
@@ -76,7 +75,7 @@ variable `uuencode-external-decoder'."
 				(buffer-substring (match-beginning 0)
 						  (match-end 0))
 			      )))))
-	  (default-directory (or (getenv "TMP")(getenv "TEMP") "/tmp")))
+	  (default-directory mime-temp-directory))
       (if filename
 	  (as-binary-process
 	   (apply (function call-process-region)
@@ -126,7 +125,7 @@ START and END are buffer positions."
 			    (buffer-substring (match-beginning 0)
 					      (match-end 0))
 			  )))))
-	  (default-directory (or (getenv "TMP")(getenv "TEMP") "/tmp")))
+	  (default-directory mime-temp-directory))
       (if file
 	  (as-binary-process
 	   (apply (function call-process-region)
diff --git a/mime-def.el b/mime-def.el
index 40c5270..b55fc47 100644
--- a/mime-def.el
+++ b/mime-def.el
@@ -25,7 +25,7 @@
 ;;; Code:
 
 (defconst mime-spadework-module-version-string
-  "FLIM-FLAM 1.2.0 - \"$BEm2V(B\" 2.5R6.0/10.0")
+  "FLIM-FLAM 1.2.0 - \"$B:y(B\" 2.5R7.0/7.0")
 
 
 ;;; @ variables