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