merge from flim-1_14 branch.

diff --git a/ChangeLog b/ChangeLog
index c45b28d..98d707d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2003-12-14  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * mime-def.el (mime-header-accept-quoted-encoded-words): Change
+       default value to nil.
+
+2003-03-10  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * eword-decode.el (eword-analyze-quoted-string): Decode
+       quoted-encoded-words when
+       `mime-header-accept-quoted-encoded-words' is not nil.
+
+       * mime.el (mime-entity-filename): Decode quoted-encoded-words when
+       `mime-header-accept-quoted-encoded-words' is not nil.
+
+       * mime-def.el (mime-header-accept-quoted-encoded-words): New user
+       option.
+
+2003-12-14  Tatsuya Kinoshita  <tats@vega.ocn.ne.jp>
+
+       * eword-encode.el (mime-header-charset-encoding-alist): Add
+       entry for iso-8859-1[45].
+
 2003-11-13  Yoichi NAKAYAMA  <yoichi@geiin.org>
 
        * FLIM-ELS (flim-modules): Install mel-b-el also for

diff --git a/VERSION b/VERSION
index c0c642f..fdf596e 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,127 +3,128 @@
 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
-;;-------------------------------------------------------------------------
-1.0.1  Ky\e-Dòto\e-A                     \e$(B5~ET\e(B             ; <=> JR, \e$(B5~ET;T8rDL6I\e(B
-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.4.0  Kintetsu-Tambabashi     \e$(B6aE4C0GH66\e(B       ; <=> \e$(B5~:e\e(B \e$(BC0GH66\e(B
-1.4.1  Momoyama-Gory\e-Dòmae\e-A \e$(BEm;38fNMA0\e(B
-1.5.0  Mukaijima               \e$(B8~Eg\e(B
-1.6.0  Ogura                   \e$(B>.AR\e(B
-1.7.0  Iseda                   \e$(B0K@*ED\e(B
-1.8.0  \e-DÒkubo\e-A                     \e$(BBg5WJ]\e(B
-1.8.1  Kutsukawa               \e$(B5WDE@n\e(B
-1.9.0  Terada                  \e$(B;{ED\e(B
-1.9.1  Tonosh\e-Dò\e-A                   \e$(BIYLnAq\e(B
-1.9.2  Shin-Tanabe             \e$(B?7EDJU\e(B
-1.10.0 K\e-Dòdo\e-A                      \e$(B6=8M\e(B
-1.10.1 Miyamaki                \e$(B;0;3LZ\e(B
-1.10.2 Kintetsu-Miyazu         \e$(B6aE45\DE\e(B
-1.10.3 Komada                  \e$(B9}ED\e(B
-1.10.4 Shin-H\e-Dòsono\e-A               \e$(B?7=K1`\e(B           ; <=> JR \e$(BJRD.@~\e(B \e$(B=K1`\e(B
-1.10.5 Kizugawadai             \e$(BLZDE@nBf\e(B
-1.11.0 Yamadagawa              \e$(B;3ED@n\e(B
-1.11.1 Takanohara              \e$(B9b$N86\e(B
-1.11.2 Heij\e-Dò\e-A                     \e$(BJ?>k\e(B
-1.11.3 Saidaiji                \e$(B@>Bg;{\e(B           ; = \e$(B6aE4\e(B \e$(BF`NI@~\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$(B3`86@~\e(B
-;;-------------------------------------------------------------------------
-       (Saidaiji)              (\e$(B@>Bg;{\e(B)
-1.12.0 Amagatsuji              \e$(BFt%vDT\e(B
-1.12.1 Nishinoky\e-Dò\e-A                \e$(B@>$N5~\e(B
-1.12.2 Kuj\e-Dò\e-A                      \e$(B6e>r\e(B
-1.12.3 Kintetsu-K\e-Dòriyama\e-A \e$(B6aE474;3\e(B
-1.12.4 Tsutsui                 \e$(BE{0f\e(B
-1.12.5 Hirahata                \e$(BJ?C<\e(B             ; = \e$(B6aE4\e(B \e$(BE7M}@~\e(B
-1.12.6 Family-K\e-Dòenmae\e-A            \e$(B%U%!%_%j!<8x1`A0\e(B
-1.12.7 Y\e-Dþzaki\e-A                    \e$(B7k:j\e(B
-1.13.0 Iwami                   \e$(B@P8+\e(B
-1.13.1 Tawaramoto              \e$(BED86K\\e(B           ; <=> \e$(B6aE4\e(B \e$(B@>ED86K\\e(B
-1.13.2 Kasanui                 \e$(B3^K%\e(B
-1.14.0 Ninokuchi               \e$(B?7%N8}\e(B
-1.14.1 Yagi                    \e$(BH,LZ\e(B             ; = \e$(B6aE4\e(B \e$(BBg:e@~\e(B
-1.14.2 Yagi-Nishiguchi         \e$(BH,LZ@>8}\e(B
-1.14.3 Unebigory\e-Dòmae\e-A             \e$(B@&K58fNMA0\e(B
-1.14.4 Kashiharajing\e-Dþ-mae\e-A        \e$(B3`86?@5\A0\e(B       ; = \e$(B6aE4\e(B \e$(BFnBg:e@~!"5HLn@~\e(B
-
-
-;;-------------------------------------------------------------------------
-;;     Keihan Electric Railway \e$(B5~:eEE5$E4F;\e(B     http://www.keihan.co.jp/
-;;                             \e$(B3{El@~\e(B
-;;-------------------------------------------------------------------------
-1.14.5 Demachiyanagi           \e$(B=PD.Lx\e(B           ; <=> \e$(B1CEE\e(B
+;;     Kinki Nippon Railway    \e$B6a5&F|K\E4F;\e(B      http://www.kintetsu.co.jp/
+;;     Ky\e,Dr\e(Bto Line                \e$B5~ET@~\e(B
+;;-------------------------------------------------------------------------
+1.0.1  Ky\e,Dr\e(Bto                     \e$B5~ET\e(B              ; <=> JR, \e$B5~ET;T8rDL6I\e(B
+1.1.0  T\e,Dr\e(Bji                      \e$BEl;{\e(B
+1.2.0  J\e,D~\e(Bj\e,Dr\e(B                        \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.4.0  Kintetsu-Tambabashi     \e$B6aE4C0GH66\e(B        ; <=> \e$B5~:e\e(B \e$BC0GH66\e(B
+1.4.1  Momoyama-Gory\e,Dr\e(Bmae \e$BEm;38fNMA0\e(B
+1.5.0  Mukaijima               \e$B8~Eg\e(B
+1.6.0  Ogura                   \e$B>.AR\e(B
+1.7.0  Iseda                   \e$B0K@*ED\e(B
+1.8.0  \e,DR\e(Bkubo                     \e$BBg5WJ]\e(B
+1.8.1  Kutsukawa               \e$B5WDE@n\e(B
+1.9.0  Terada                  \e$B;{ED\e(B
+1.9.1  Tonosh\e,Dr\e(B                   \e$BIYLnAq\e(B
+1.9.2  Shin-Tanabe             \e$B?7EDJU\e(B
+1.10.0 K\e,Dr\e(Bdo                      \e$B6=8M\e(B
+1.10.1 Miyamaki                \e$B;0;3LZ\e(B
+1.10.2 Kintetsu-Miyazu         \e$B6aE45\DE\e(B
+1.10.3 Komada                  \e$B9}ED\e(B
+1.10.4 Shin-H\e,Dr\e(Bsono               \e$B?7=K1`\e(B            ; <=> JR \e$BJRD.@~\e(B \e$B=K1`\e(B
+1.10.5 Kizugawadai             \e$BLZDE@nBf\e(B
+1.11.0 Yamadagawa              \e$B;3ED@n\e(B
+1.11.1 Takanohara              \e$B9b$N86\e(B
+1.11.2 Heij\e,Dr\e(B                     \e$BJ?>k\e(B
+1.11.3 Saidaiji                \e$B@>Bg;{\e(B            ; = \e$B6aE4\e(B \e$BF`NI@~\e(B
+;;-------------------------------------------------------------------------
+;;     Kinki Nippon Railway    \e$B6a5&F|K\E4F;\e(B      http://www.kintetsu.co.jp/
+;;     Ky\e,Dr\e(Bto Line                \e$B3`86@~\e(B
+;;-------------------------------------------------------------------------
+       (Saidaiji)              (\e$B@>Bg;{\e(B)
+1.12.0 Amagatsuji              \e$BFt%vDT\e(B
+1.12.1 Nishinoky\e,Dr\e(B                \e$B@>$N5~\e(B
+1.12.2 Kuj\e,Dr\e(B                      \e$B6e>r\e(B
+1.12.3 Kintetsu-K\e,Dr\e(Briyama \e$B6aE474;3\e(B
+1.12.4 Tsutsui                 \e$BE{0f\e(B
+1.12.5 Hirahata                \e$BJ?C<\e(B              ; = \e$B6aE4\e(B \e$BE7M}@~\e(B
+1.12.6 Family-K\e,Dr\e(Benmae            \e$B%U%!%_%j!<8x1`A0\e(B
+1.12.7 Y\e,D~\e(Bzaki                    \e$B7k:j\e(B
+1.13.0 Iwami                   \e$B@P8+\e(B
+1.13.1 Tawaramoto              \e$BED86K\\e(B            ; <=> \e$B6aE4\e(B \e$B@>ED86K\\e(B
+1.13.2 Kasanui                 \e$B3^K%\e(B
+1.14.0 Ninokuchi               \e$B?7%N8}\e(B
+1.14.1 Yagi                    \e$BH,LZ\e(B              ; = \e$B6aE4\e(B \e$BBg:e@~\e(B
+1.14.2 Yagi-Nishiguchi         \e$BH,LZ@>8}\e(B
+1.14.3 Unebigory\e,Dr\e(Bmae             \e$B@&K58fNMA0\e(B
+1.14.4 Kashiharajing\e,D~\e(B-mae        \e$B3`86?@5\A0\e(B        ; = \e$B6aE4\e(B \e$BFnBg:e@~!"5HLn@~\e(B
+
+
+;;-------------------------------------------------------------------------
+;;     Keihan Electric Railway \e$B5~:eEE5$E4F;\e(B      http://www.keihan.co.jp/
+;;     \e,DR\e(Bt\e,Dr\e(B Line            \e$B3{El@~\e(B
+;;-------------------------------------------------------------------------
+1.14.5 Demachiyanagi           \e$B=PD.Lx\e(B            ; <=> \e$B1CEE\e(B
+1.14.6 Marutamachi             \e$B4]B@D.\e(B
 
 
 [Chao Version names]
 
 ;;-------------------------------------------------------------------------
 ;;     Kyoto Municipal Transfer Bureau
-;;                             \e$(B5~ET;T8rDL6I\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.4.0  J\e-Dþjò\e-A                      \e$(B==>r\e(B
-1.6.0  Kuj\e-Dò\e-A                      \e$(B6e>r\e(B
-1.6.1  Ky\e-Dòto\e-A                     \e$(B5~ET\e(B             ; <=> JR, \e$(B6aE4\e(B
-1.7.0  Goj\e-Dò\e-A                      \e$(B8^>r\e(B
-1.8.0  Shij\e-Dò\e-A                     \e$(B;M>r\e(B             ; <=> \e$(B:e5^\e(B \e$(B5~ET@~\e(B
-1.9.0  Karasuma Oike           \e$(B1(4]8fCS\e(B ; = \e$(B5~ET;T8rDL6I\e(B \e$(BEl@>@~\e(B
-1.10.0 Marutamach              \e$(B4]B@D.\e(B
-1.11.0 Imadegawa               \e$(B:#=P@n\e(B
-1.11.1 Kuramaguchi             \e$(B0HGO8}\e(B
-1.11.2 Kita\e-Dòji\e-A                   \e$(BKLBgO)\e(B
-1.11.3 Kitayama                \e$(BKL;3\e(B
-1.11.4 Matugasaki              \e$(B>>%v:j\e(B
-1.11.5 Kokusaikaikan           \e$(B9q:]2q4[\e(B
-
-;;-------------------------------------------------------------------------
-;;     West Japan Railway      \e$(B@>F|K\N95RE4F;\e(B   http://www.westjr.co.jp/
-;;     Nara Line               \e$(BF`NI@~\e(B
-;;-------------------------------------------------------------------------
-1.12.0 [JR] Ky\e-Dòto\e-A                \e$(B5~ET\e(B             ; <=> \e$(B6aE4\e(B, \e$(B5~ET;T8rDL6I\e(B
-1.12.1 T\e-Dòfukuji\e-A          \e$(BElJ!;{\e(B           ; <=> \e$(B5~:e\e(B
-1.12.2 Inari                   \e$(B0p2Y\e(B
-1.13.0 JR Fujinomori           JR \e$(BF#?9\e(B
-1.14.0 Momoyama                \e$(BEm;3\e(B
-1.14.1 Rokujiz\e-Dò\e-A          \e$(BO;COB"\e(B
------- Kohata                  \e$(BLZH(\e(B
------- \e-DÒbaku\e-A                     \e$(B2+]!\e(B
------- Uji                     \e$(B1'<#\e(B
------- Shinden                 \e$(B?7ED\e(B
------- J\e-Dòyò\e-A                      \e$(B>kM[\e(B
------- Nagaike                 \e$(BD9CS\e(B
------- Yamashiro-Aodani        \e$(B;3>k@DC+\e(B
------- Yamashiro-Taga          \e$(B;3>kB?2l\e(B
------- Tamamizu                \e$(B6L?e\e(B
------- Tanakura                \e$(BC*AR\e(B
------- Kamikoma                \e$(B>e9}\e(B
------- Kidu                    \e$(BLZDE\e(B
+;;     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.4.0  J\e,D~\e(Bj\e,Dr\e(B                        \e$B==>r\e(B
+1.6.0  Kuj\e,Dr\e(B                      \e$B6e>r\e(B
+1.6.1  Ky\e,Dr\e(Bto                     \e$B5~ET\e(B              ; <=> JR, \e$B6aE4\e(B
+1.7.0  Goj\e,Dr\e(B                      \e$B8^>r\e(B
+1.8.0  Shij\e,Dr\e(B                     \e$B;M>r\e(B              ; <=> \e$B:e5^\e(B \e$B5~ET@~\e(B
+1.9.0  Karasuma Oike           \e$B1(4]8fCS\e(B  ; = \e$B5~ET;T8rDL6I\e(B \e$BEl@>@~\e(B
+1.10.0 Marutamach              \e$B4]B@D.\e(B
+1.11.0 Imadegawa               \e$B:#=P@n\e(B
+1.11.1 Kuramaguchi             \e$B0HGO8}\e(B
+1.11.2 Kita\e,Dr\e(Bji                   \e$BKLBgO)\e(B
+1.11.3 Kitayama                \e$BKL;3\e(B
+1.11.4 Matugasaki              \e$B>>%v:j\e(B
+1.11.5 Kokusaikaikan           \e$B9q:]2q4[\e(B
+
+;;-------------------------------------------------------------------------
+;;     West Japan Railway      \e$B@>F|K\N95RE4F;\e(B    http://www.westjr.co.jp/
+;;     Nara Line               \e$BF`NI@~\e(B
+;;-------------------------------------------------------------------------
+1.12.0 [JR] Ky\e,Dr\e(Bto                \e$B5~ET\e(B              ; <=> \e$B6aE4\e(B, \e$B5~ET;T8rDL6I\e(B
+1.12.1 T\e,Dr\e(Bfukuji          \e$BElJ!;{\e(B            ; <=> \e$B5~:e\e(B
+1.12.2 Inari                   \e$B0p2Y\e(B
+1.13.0 JR Fujinomori           JR \e$BF#?9\e(B
+1.14.0 Momoyama                \e$BEm;3\e(B
+1.14.1 Rokujiz\e,Dr\e(B          \e$BO;COB"\e(B
+------ Kohata                  \e$BLZH(\e(B
+------ \e,DR\e(Bbaku                     \e$B2+]!\e(B
+------ Uji                     \e$B1'<#\e(B
+------ Shinden                 \e$B?7ED\e(B
+------ J\e,Dr\e(By\e,Dr\e(B                        \e$B>kM[\e(B
+------ Nagaike                 \e$BD9CS\e(B
+------ Yamashiro-Aodani        \e$B;3>k@DC+\e(B
+------ Yamashiro-Taga          \e$B;3>kB?2l\e(B
+------ Tamamizu                \e$B6L?e\e(B
+------ Tanakura                \e$BC*AR\e(B
+------ Kamikoma                \e$B>e9}\e(B
+------ Kidu                    \e$BLZDE\e(B
 
 
 [CLIME Version names]
 
 ;;-------------------------------------------------------------------------
-;;                             \e$(BBg:eEE5$50F;\e(B
-;;                             \e$(BK!N4;{@~\e(B \e$(B!J5l\e(B \e$(BE7M}7ZJXoDF;\e(B \e$(BE7M}@~!K\e(B
+;;                             \e$BBg:eEE5$50F;\e(B
+;;                             \e$BK!N4;{@~\e(B  \e$B!J5l\e(B \e$BE7M}7ZJXoDF;\e(B \e$BE7M}@~!K\e(B
 ;;-------------------------------------------------------------------------
-1.13.0 Shin-H\e-Dòryþji\e-A              \e$(B?7K!N4;{\e(B ; <=> \e$(B4X@>K\@~\e(B \e$(BK!N4;{\e(B
-1.13.1 Ando                    \e$(B0BEH\e(B
-1.13.2 Nukatabe                \e$(B3[EDIt\e(B
-1.13.3 Hirahata                \e$(BJ?C<\e(B             ; = \e$(BBg50\e(B \e$(BE7M}@~!"@&K5@~\e(B
+1.13.0 Shin-H\e,Dr\e(Bry\e,D~\e(Bji                \e$B?7K!N4;{\e(B  ; <=> \e$B4X@>K\@~\e(B \e$BK!N4;{\e(B
+1.13.1 Ando                    \e$B0BEH\e(B
+1.13.2 Nukatabe                \e$B3[EDIt\e(B
+1.13.3 Hirahata                \e$BJ?C<\e(B              ; = \e$BBg50\e(B \e$BE7M}@~!"@&K5@~\e(B
 
 ;;-------------------------------------------------------------------------
-;;     Hokuriku Railway        \e$(BKLN&E4F;\e(B
-;;     Nomi Line               \e$(BG=H~@~\e(B           \e$(B!J5l\e(B \e$(BG=H~EE5$E4F;!K\e(B
+;;     Hokuriku Railway        \e$BKLN&E4F;\e(B
+;;     Nomi Line               \e$BG=H~@~\e(B            \e$B!J5l\e(B \e$BG=H~EE5$E4F;!K\e(B
 ;;
 ;;     "\e$BN/CS\e(B" \e$B$*$h$S\e(B "\e$B;{0f@>8}\e(B" \e$B0J9_$O\e(B OHNO Toshihiko \e$B$5$^$4Ds6!$N!"\e(B
 ;;     JTB \e$B@PLnE/JT!XA49qGQ@~;dE4$NDd<V>l0lMw!Y$r85$K$7$F$$$^$9!#\e(B
@@ -131,10 +132,10 @@
 1.13.4 Shin-Terai              \e$B?7;{0f\e(B            ; <=> \e$BKLN&K\@~\e(B \e$B;{0f\e(B
 ------ Tameike                 \e$BN/CS\e(B
 1.13.5 Kaga-Fukuoka            \e$B2C2lJ!2,\e(B
-1.13.6 Nakanosh\e-Dò\e-A         \e$BCf%N>1\e(B            ; \e$B$N$A$KCf$N>1$K2~>N\e(B
-1.14.0 Gokend\e-Dò\e-A                   \e$B8^4VF2\e(B
+1.13.6 Nakanosh\e,Dr\e(B         \e$BCf%N>1\e(B            ; \e$B$N$A$KCf$N>1$K2~>N\e(B
+1.14.0 Gokend\e,Dr\e(B                   \e$B8^4VF2\e(B
 1.14.3 Terai-Nishikuchi        \e$B;{0f@>8}\e(B
-1.14.4 Jid\e-Dò\e-Asha-Renraku           \e$B<+F0<VO"Mm\e(B
+1.14.4 Jid\e,Dr\e(Bsha-Renraku           \e$B<+F0<VO"Mm\e(B
 1.14.5 Hon-Terai               \e$BK\;{0f\e(B
 ------ Suenobu-Ushijima        \e$BKv?.5mEg\e(B
 ------ Kaga-Sano               \e$B2C2l:4Ln\e(B
@@ -157,55 +158,55 @@
 [LIMIT Version names]
 
 ;;-------------------------------------------------------------------------
-;;     Kinki Nippon Railway    \e$(B6a5&F|K\E4F;\e(B     http://www.kintetsu.co.jp/
-;;     Minami-\e-DÒsaka\e-A Line \e$(BFnBg:e@~\e(B
-;;-------------------------------------------------------------------------
-1.13.0 \e-DÒsaka-Abenobashi\e-A          \e$(BBg:e0$ItLn66\e(B     ; <=> JR, \e$(BBg:e;T8rDL6I\e(B
-1.13.1 Koboreguchi                     \e$(B2OKY8}\e(B
-1.13.2 Kita-tanabe                     \e$(BKLEDJU\e(B
-1.13.3 Imagawa                         \e$(B:#@n\e(B
-1.13.4 Harinakano                      \e$(B?KCfLn\e(B
-1.14.0 Yata                            \e$(BLpED\e(B
-1.14.1 Kawachi-Amami                   \e$(B2OFbE7H~\e(B
-1.14.2 Nunose                          \e$(BI[G&\e(B
-1.14.3 Takaminosato                    \e$(B9b8+%NN$\e(B
-1.14.4 Kawachi-Matsubara               \e$(B2OFb>>86\e(B
-1.14.5 Eganosh\e-Dò\e-A                  \e$(B7C2f%NAq\e(B
-1.14.6 Takawashi                       \e$(B9bOI\e(B
-1.14.7 Fujiidera                       \e$(BF#0f;{\e(B
------- Hajinosato                      \e$(BEZ;U$NN$\e(B
------- D\e-Dòmyòji\e-A                           \e$(BF;L@;{\e(B
------- Furuichi                        \e$(B8E;T\e(B             ; = \e$(B6aE4\e(B \e$(BD9Ln@~\e(B
------- Komagatani                      \e$(B6p%vC+\e(B
------- Kaminotaishi                    \e$(B>e%NB@;R\e(B
------- Nij\e-Dòsan\e-A                           \e$(BFs>e;3\e(B
------- Nij\e-Dòjinjaguchi\e-A                    \e$(BFs>e?@<R8}\e(B
------- Taimadera                       \e$(BEvKc;{\e(B
------- Iwaki                           \e$(BHX>k\e(B
------- Shakudo                         \e$(B<\EZ\e(B             ; = \e$(B6aE4\e(B \e$(B8f=j@~\e(B
------- Takadashi                       \e$(B9bED;T\e(B
------- Ukiana                          \e$(BIb9&\e(B
------- B\e-Dòjò\e-A                              \e$(BK7>k\e(B
------- Kashiharajing\e-Dþ-Nisiguchi\e-A  \e$(B3`86?@5\@>8}\e(B
------- Kashiharajing\e-Dþmae\e-A         \e$(B3`86?@5\A0\e(B       ; = \e$(B6aE4\e(B \e$(B3`86@~\e(B
-
-;;-------------------------------------------------------------------------
-;;     Kinki Nippon Railway    \e$(B6a5&F|K\E4F;\e(B     http://www.kintetsu.co.jp/
-;;     Yoshino Line    \e$(B5HLn@~\e(B [\e$(B$G$b!"$3$l!"K\2H$,;H$&$s$d$m$J$!!D\e(B (^^;]
-;;-------------------------------------------------------------------------
-       (Kashiharajing\e-Dþmae)\e-A               (\e$(B3`86?@5\A0\e(B)
------- Okadera                         \e$(B2,;{\e(B
------- Asuka                           \e$(BHtD;\e(B
------- Tsubosakayama                   \e$(BTd:e;3\e(B
------- Ichio                           \e$(B;THx\e(B
------- Kuzu                            \e$(B3k\e(B
------- Yoshinoguchi                    \e$(B5HLn8}\e(B           ; = JR \e$(BOB2N;3@~\e(B
------- Kusurimizu                      \e$(BLt?e\e(B
------- Fukugami                        \e$(BJ!?@\e(B
------- \e-DÒada\e-A                              \e$(BBg0$B@\e(B
------- Shimoichiguchi                  \e$(B2<;T8}\e(B
------- Koshibe                         \e$(B1[It\e(B
------- Muda                            \e$(BO;ED\e(B
------- Yamato-Kamiichi                 \e$(BBgOB>e;T\e(B
------- Yoshinojing\e-Dþ\e-A                      \e$(B5HLn?@5\\e(B
------- Yoshino                         \e$(B5HLn\e(B
+;;     Kinki Nippon Railway    \e$B6a5&F|K\E4F;\e(B      http://www.kintetsu.co.jp/
+;;     Minami-\e,DR\e(Bsaka Line \e$BFnBg:e@~\e(B
+;;-------------------------------------------------------------------------
+1.13.0 \e,DR\e(Bsaka-Abenobashi          \e$BBg:e0$ItLn66\e(B      ; <=> JR, \e$BBg:e;T8rDL6I\e(B
+1.13.1 Koboreguchi                     \e$B2OKY8}\e(B
+1.13.2 Kita-tanabe                     \e$BKLEDJU\e(B
+1.13.3 Imagawa                         \e$B:#@n\e(B
+1.13.4 Harinakano                      \e$B?KCfLn\e(B
+1.14.0 Yata                            \e$BLpED\e(B
+1.14.1 Kawachi-Amami                   \e$B2OFbE7H~\e(B
+1.14.2 Nunose                          \e$BI[G&\e(B
+1.14.3 Takaminosato                    \e$B9b8+%NN$\e(B
+1.14.4 Kawachi-Matsubara               \e$B2OFb>>86\e(B
+1.14.5 Eganosh\e,Dr\e(B                  \e$B7C2f%NAq\e(B
+1.14.6 Takawashi                       \e$B9bOI\e(B
+1.14.7 Fujiidera                       \e$BF#0f;{\e(B
+1.14.8 Hajinosato                      \e$BEZ;U$NN$\e(B
+------ D\e,Dr\e(Bmy\e,Dr\e(Bji                             \e$BF;L@;{\e(B
+------ Furuichi                        \e$B8E;T\e(B              ; = \e$B6aE4\e(B \e$BD9Ln@~\e(B
+------ Komagatani                      \e$B6p%vC+\e(B
+------ Kaminotaishi                    \e$B>e%NB@;R\e(B
+------ Nij\e,Dr\e(Bsan                           \e$BFs>e;3\e(B
+------ Nij\e,Dr\e(Bjinjaguchi                    \e$BFs>e?@<R8}\e(B
+------ Taimadera                       \e$BEvKc;{\e(B
+------ Iwaki                           \e$BHX>k\e(B
+------ Shakudo                         \e$B<\EZ\e(B              ; = \e$B6aE4\e(B \e$B8f=j@~\e(B
+------ Takadashi                       \e$B9bED;T\e(B
+------ Ukiana                          \e$BIb9&\e(B
+------ B\e,Dr\e(Bj\e,Dr\e(B                                \e$BK7>k\e(B
+------ Kashiharajing\e,D~\e(B-Nisiguchi  \e$B3`86?@5\@>8}\e(B
+------ Kashiharajing\e,D~\e(Bmae         \e$B3`86?@5\A0\e(B        ; = \e$B6aE4\e(B \e$B3`86@~\e(B
+
+;;-------------------------------------------------------------------------
+;;     Kinki Nippon Railway    \e$B6a5&F|K\E4F;\e(B      http://www.kintetsu.co.jp/
+;;     Yoshino Line    \e$B5HLn@~\e(B [\e$B$G$b!"$3$l!"K\2H$,;H$&$s$d$m$J$!!D\e(B (^^;]
+;;-------------------------------------------------------------------------
+       (Kashiharajing\e,D~\e(Bmae)               (\e$B3`86?@5\A0\e(B)
+------ Okadera                         \e$B2,;{\e(B
+------ Asuka                           \e$BHtD;\e(B
+------ Tsubosakayama                   \e$BTd:e;3\e(B
+------ Ichio                           \e$B;THx\e(B
+------ Kuzu                            \e$B3k\e(B
+------ Yoshinoguchi                    \e$B5HLn8}\e(B            ; = JR \e$BOB2N;3@~\e(B
+------ Kusurimizu                      \e$BLt?e\e(B
+------ Fukugami                        \e$BJ!?@\e(B
+------ \e,DR\e(Bada                              \e$BBg0$B@\e(B
+------ Shimoichiguchi                  \e$B2<;T8}\e(B
+------ Koshibe                         \e$B1[It\e(B
+------ Muda                            \e$BO;ED\e(B
+------ Yamato-Kamiichi                 \e$BBgOB>e;T\e(B
+------ Yoshinojing\e,D~\e(B                      \e$B5HLn?@5\\e(B
+------ Yoshino                         \e$B5HLn\e(B

diff --git a/eword-decode.el b/eword-decode.el
index fa3081e..2d29c37 100644 (file)
--- a/eword-decode.el
+++ b/eword-decode.el
@@ -1,6 +1,6 @@
 ;;; eword-decode.el --- RFC 2047 based encoded-word decoder for GNU Emacs
 
-;; Copyright (C) 1995,1996,1997,1998,1999,2000 Free Software Foundation, Inc.
+;; Copyright (C) 1995,96,97,98,99,2000,01,03 Free Software Foundation, Inc.
 
 ;; Author: ENAMI Tsugutomo <enami@sys.ptg.sony.co.jp>
 ;;         MORIOKA Tomohiko <tomo@m17n.org>
@@ -628,16 +628,17 @@ returns nil, next function is used.  Otherwise the return value will
 be the result.")
 
 (defun eword-analyze-quoted-string (string start &optional must-unfold)
-  (let ((p (std11-check-enclosure string ?\" ?\" nil start)))
-    (if p
-       (cons (cons 'quoted-string
-                   (decode-mime-charset-string
-                    (std11-strip-quoted-pair
-                     (substring string (1+ start) (1- p)))
-                    default-mime-charset))
-             ;;(substring string p))
-             p)
-      )))
+  (let ((p (std11-check-enclosure string ?\" ?\" nil start))
+       ret)
+    (when p
+      (setq ret (decode-mime-charset-string
+                (std11-strip-quoted-pair
+                 (substring string (1+ start) (1- p)))
+                default-mime-charset))
+      (if mime-header-accept-quoted-encoded-words
+         (setq ret (eword-decode-string ret)))
+      (cons (cons 'quoted-string ret)
+           p))))
 
 (defun eword-analyze-domain-literal (string start &optional must-unfold)
   (std11-analyze-domain-literal string start))

diff --git a/eword-encode.el b/eword-encode.el
index 30700fd..c930c86 100644 (file)
--- a/eword-encode.el
+++ b/eword-encode.el
@@ -46,6 +46,8 @@
     (iso-8859-7                . "Q")
     (iso-8859-8                . "Q")
     (iso-8859-9                . "Q")
+    (iso-8859-14       . "Q")
+    (iso-8859-15       . "Q")
     (iso-2022-jp       . "B")
     (iso-2022-jp-3     . "B")
     (iso-2022-kr       . "B")

diff --git a/mime-def.el b/mime-def.el
index 7197b34..e9841dd 100644 (file)
--- a/mime-def.el
+++ b/mime-def.el
@@ -1,6 +1,7 @@
 ;;; mime-def.el --- definition module about MIME -*- coding: ctext; -*-
 
-;; Copyright (C) 1995,96,97,98,99,2000,2001,2002 Free Software Foundation, Inc.
+;; Copyright (C) 1995,96,97,98,99,2000,2001,2002,2003
+;;   Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <tomo@m17n.org>
 ;;     Shuhei KOBAYASHI <shuhei@aqua.ocn.ne.jp>
@@ -32,7 +33,7 @@
 (eval-when-compile (require 'luna))    ; luna-arglist-to-arguments
 
 (eval-and-compile
-  (defconst mime-library-product ["LIMIT" (1 14 7) "Fujiidera"]
+  (defconst mime-library-product ["LIMIT" (1 14 8) "Hajinosato"]
     "Product name, version number and code name of MIME-library package."))
 
 (defmacro mime-product-name (product)
@@ -82,6 +83,12 @@
   :type '(choice (integer :tag "Limit (bytes)")
                 (const :tag "Don't limit" nil)))
 
+(defcustom mime-header-accept-quoted-encoded-words nil
+  "*Accept encoded-words in quoted-strings."
+  :group 'mime-header
+  :type 'boolean)
+
+
 ;;; @@@ encoding
 ;;;
 

diff --git a/mime.el b/mime.el
index 49707a9..4cb2325 100644 (file)
--- a/mime.el
+++ b/mime.el
@@ -1,6 +1,6 @@
 ;;; mime.el --- MIME library module
 
-;; Copyright (C) 1998,1999,2000 Free Software Foundation, Inc.
+;; Copyright (C) 1998,1999,2000,2001,2003 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <tomo@m17n.org>
 ;; Keywords: MIME, multimedia, mail, news