Sync up with flim-1_3_0_9.

diff --git a/ChangeLog b/ChangeLog
index 78ed3c9..9ff431d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1998-06-15  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mailcap.el (mailcap-file): Use `defcustom'.
+
+\f
+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 (file)
--- a/FLIM-VERSION
+++ b/FLIM-VERSION
@@ -3,24 +3,25 @@
 1.0.0  -----
 
 ;;-------------------------------------------------------------------------
-;;     Kinki Nippon Railway
-;;                     \e$(B6a5&F|K\E4F;\e(B     http://www.kintetsu.co.jp/
-;;     Ky\e-Dòto\e-A Line        \e$(B5~ET@~\e(B
+;;     Kinki Nippon Railway    \e$(B6a5&F|K\E4F;\e(B     http://www.kintetsu.co.jp/
+;;     Ky\e-Dòto\e-A Line                \e$(B5~ET@~\e(B
 ;;-------------------------------------------------------------------------
-1.0.1  Ky\e-Dòto\e-A             \e$(B5~ET\e(B             ; <=> JR
-1.1.0  T\e-Dòji\e-A              \e$(BEl;{\e(B
-1.2.0  J\e-Dþjò\e-A              \e$(B==>r\e(B
-1.2.1  Kamitobaguchi   \e$(B>eD;1)8}\e(B
-1.2.2  Takeda          \e$(BC]ED\e(B             ; = \e$(B5~ET;T8rDL6I\e(B \e$(B1(4]@~\e(B
+1.0.1  Ky\e-Dòto\e-A                     \e$(B5~ET\e(B             ; <=> JR
+1.1.0  T\e-Dòji\e-A                      \e$(BEl;{\e(B
+1.2.0  J\e-Dþjò\e-A                      \e$(B==>r\e(B
+1.2.1  Kamitobaguchi           \e$(B>eD;1)8}\e(B
+1.2.2  Takeda                  \e$(BC]ED\e(B             ; = \e$(B5~ET;T8rDL6I\e(B \e$(B1(4]@~\e(B
+1.3.0  Fushimi                 \e$(BIz8+\e(B
+1.3.1  Kintetsu-Tanbabashi     \e$(B6aE4C0GH66\e(B
 
 
 [Chao Version names]
 
 ;;-------------------------------------------------------------------------
 ;;     Kyoto Municipal Transfer Bureau
-;;                     \e$(B5~ET;T8rDL6I\e(B
-;;                             http://www.city.kyoto.jp/kotsu/main.htm
-;;     Karasuma Line   \e$(B1(4]@~\e(B
+;;                             \e$(B5~ET;T8rDL6I\e(B
+;;             http://www.city.kyoto.jp/kotsu/main.htm
+;;     Karasuma Line           \e$(B1(4]@~\e(B
 ;;-------------------------------------------------------------------------
-1.2.0  Takeda          \e$(BC]ED\e(B             ; = \e$(B6aE4\e(B \e$(B5~ET@~\e(B
-1.3.0  Kuinabashi      \e$(B$/$$$J66\e(B
+1.2.0  Takeda                  \e$(BC]ED\e(B             ; = \e$(B6aE4\e(B \e$(B5~ET@~\e(B
+1.3.0  Kuinabashi              \e$(B$/$$$J66\e(B

diff --git a/Makefile b/Makefile
index 2cc58b9..00e3361 100644 (file)
--- 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 (file)
--- 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.