From: morioka <morioka>
Date: Tue, 16 Jun 1998 08:19:40 +0000 (+0000)
Subject: Sync up with flim-1_3_0_9.
X-Git-Tag: chao-1_3_0
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=738a4478e9f6c4a94e31558ce677275f12b822e4;p=elisp%2Fflim.git

Sync up with flim-1_3_0_9.
---

diff --git a/ChangeLog b/ChangeLog
index 78ed3c9..9ff431d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1998-06-15  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* mailcap.el (mailcap-file): Use `defcustom'.
+
+
+1998-06-01  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* FLIM: Version 1.3.0 (Fushimi) was released.
+
 1998-05-28  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
 	* std11.el (std11-fetch-field): New function.
diff --git a/FLIM-VERSION b/FLIM-VERSION
index 7021437..6b4c994 100644
--- a/FLIM-VERSION
+++ b/FLIM-VERSION
@@ -3,24 +3,25 @@
 1.0.0	-----
 
 ;;-------------------------------------------------------------------------
-;;	Kinki Nippon Railway
-;;			$(B6a5&F|K\E4F;(B	http://www.kintetsu.co.jp/
-;;	Ky-Dòto-A Line	$(B5~ET@~(B
+;;	Kinki Nippon Railway	$(B6a5&F|K\E4F;(B	http://www.kintetsu.co.jp/
+;;	Ky-Dòto-A Line		$(B5~ET@~(B
 ;;-------------------------------------------------------------------------
-1.0.1	Ky-Dòto-A		$(B5~ET(B		; <=> JR
-1.1.0	T-Dòji-A		$(BEl;{(B
-1.2.0	J-Dþjò-A		$(B==>r(B
-1.2.1	Kamitobaguchi	$(B>eD;1)8}(B
-1.2.2	Takeda		$(BC]ED(B		; = $(B5~ET;T8rDL6I(B $(B1(4]@~(B
+1.0.1	Ky-Dòto-A			$(B5~ET(B		; <=> JR
+1.1.0	T-Dòji-A			$(BEl;{(B
+1.2.0	J-Dþjò-A			$(B==>r(B
+1.2.1	Kamitobaguchi		$(B>eD;1)8}(B
+1.2.2	Takeda			$(BC]ED(B		; = $(B5~ET;T8rDL6I(B $(B1(4]@~(B
+1.3.0	Fushimi			$(BIz8+(B
+1.3.1	Kintetsu-Tanbabashi	$(B6aE4C0GH66(B
 
 
 [Chao Version names]
 
 ;;-------------------------------------------------------------------------
 ;;	Kyoto Municipal Transfer Bureau
-;;			$(B5~ET;T8rDL6I(B
-;;				http://www.city.kyoto.jp/kotsu/main.htm
-;;	Karasuma Line	$(B1(4]@~(B
+;;				$(B5~ET;T8rDL6I(B
+;;		http://www.city.kyoto.jp/kotsu/main.htm
+;;	Karasuma Line		$(B1(4]@~(B
 ;;-------------------------------------------------------------------------
-1.2.0	Takeda		$(BC]ED(B		; = $(B6aE4(B $(B5~ET@~(B
-1.3.0	Kuinabashi	$(B$/$$$J66(B
+1.2.0	Takeda			$(BC]ED(B		; = $(B6aE4(B $(B5~ET@~(B
+1.3.0	Kuinabashi		$(B$/$$$J66(B
diff --git a/Makefile b/Makefile
index 2cc58b9..00e3361 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # Makefile for FLIM.
 #
 
-VERSION = 1.2.2
+VERSION = 1.3.0
 
 TAR	= tar
 RM	= /bin/rm -f
diff --git a/mailcap.el b/mailcap.el
index 76b3812..12eee88 100644
--- a/mailcap.el
+++ b/mailcap.el
@@ -170,8 +170,11 @@ order.  Otherwise result is not sorted."
 	    (t entries)
 	    ))))
 
-(defvar mailcap-file "~/.mailcap"
-  "*File name of user's mailcap file.")
+
+(defcustom mailcap-file "~/.mailcap"
+  "*File name of user's mailcap file."
+  :group 'mime
+  :type 'file)
 
 (defun mailcap-parse-file (&optional filename order)
   "Parse FILENAME as a mailcap, and return the result.