From 0e3f787838499a974ed9b7e1bf8e776b81b0fe63 Mon Sep 17 00:00:00 2001 From: akr Date: Tue, 27 Oct 1998 16:01:20 +0000 Subject: [PATCH] * Sync up to flim-1_11_3 from flim-1_11_2. * mime-def.el (mime-library-product): Bump up to FLAM-DOODLE 1.11.2. --- ChangeLog | 28 +++++++++++++++++++++++ DOODLE-VERSION | 2 +- FLIM-VERSION | 68 ------------------------------------------------------- Makefile | 2 +- README.ja | 5 ++-- VERSION | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ eword-decode.el | 7 +++++- eword-encode.el | 2 +- mime-def.el | 2 +- mmgeneric.el | 4 ++++ 10 files changed, 113 insertions(+), 75 deletions(-) delete mode 100644 FLIM-VERSION create mode 100644 VERSION diff --git a/ChangeLog b/ChangeLog index ef8a885..4cec1d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +1998-10-27 Tanaka Akira + + * Sync up to flim-1_11_3 from flim-1_11_2. + + * mime-def.el (mime-library-product): Bump up to FLAM-DOODLE + 1.11.2. + 1998-10-26 Tanaka Akira * Sync up to flim-1_11_2 from flim-1_11_0. @@ -1257,6 +1264,27 @@ * eword-encode.el (eword-encode-field-body): Unfold `field-body'. +1998-10-28 MORIOKA Tomohiko + + * FLIM: Version 1.11.3 (Saidaiji) was released. + +1998-10-27 MORIOKA Tomohiko + + * VERSION: New file (Renamed from FLIM-VERSION). + +1998-10-27 MORIOKA Tomohiko + + * eword-encode.el (eword-encode-char-type): Return nil for ?\n. + +1998-10-27 Tanaka Akira + + * eword-encode.el (eword-encode-field-body): Unfold `field-body'. + +1998-10-27 Yoshiki Hayashi + + * README.ja: Update. + + 1998-10-26 MORIOKA Tomohiko * FLIM: Version 1.11.2 (Heij-Dò)-A was released. diff --git a/DOODLE-VERSION b/DOODLE-VERSION index 2a37cab..81df983 100644 --- a/DOODLE-VERSION +++ b/DOODLE-VERSION @@ -24,7 +24,7 @@ Order is not significant. 18 $B@VGrFK(B $B$"$+$7$m$D$k$P$_(B 5.0YR8.0/6.0 FLAM-DOODLE 1.10.2 19 $B>.F&(B $B$"$:$-(B 2.5R3.5/5.0 FLAM-DOODLE 1.11.0 20 $BIrF:Cc(B $B$($S$A$c(B 5.0R4.0/11.0 FLAM-DOODLE 1.11.1 - 21 $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 ------ Saidaiji $(B@>Bg;{(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) ------ Amagatsuji $(BFt%vDT(B ------ Nishinoky-Dò-A $(B@>$N5~(B ------ Kuj-Dò-A $(B6e>r(B ------ Kintetsu-K-Dòriyama-A $(B6aE474;3(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 -;;------------------------------------------------------------------------- -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 diff --git a/Makefile b/Makefile index c0fdb09..1d5939d 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # PACKAGE = flim -VERSION = 1.11.2 +VERSION = 1.11.3 TAR = tar RM = /bin/rm -f diff --git a/README.ja b/README.ja index cecec7f..a3233bb 100644 --- a/README.ja +++ b/README.ja @@ -35,8 +35,9 @@ FLIM $B$H$O!)(B $B%$%s%9%H!<%k(B ============ -(0) $B%$%s%9%H!<%k$9$kA0$K!"(BAPEL $B%Q%C%1!<%8$r%$%s%9%H!<%k$7$F$/$@$5$$!#(B - APEL $B%Q%C%1!<%8$O0J2<$N$H$3$m$G 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 +;;------------------------------------------------------------------------- +;; 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) +----- Amagatsuji $(BFt%vDT(B +----- Nishinoky-Dò-A $(B@>$N5~(B +----- Kuj-Dò-A $(B6e>r(B +----- Kintetsu-K-Dòriyama-A $(B6aE474;3(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 +;;------------------------------------------------------------------------- +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 diff --git a/eword-decode.el b/eword-decode.el index 67c02e6..c5c722c 100644 --- a/eword-decode.el +++ b/eword-decode.el @@ -507,7 +507,12 @@ Non MIME encoded-word part in FILED-BODY is decoded with (1+ (string-width field-name)) (if (eq max-column t) fill-column max-column))) (setq decoded (ew-crlf-unfold decoded))) - (ew-crlf-to-lf decoded))) + (setq decoded (ew-crlf-to-lf decoded)) + (add-text-properties 0 (length decoded) + (list 'original-field-name field-name + 'original-field-body field-body) + decoded) + decoded)) (defun eword-decode-header (&optional code-conversion separator) "Decode MIME encoded-words in header fields. diff --git a/eword-encode.el b/eword-encode.el index fecd854..c87d5fa 100644 --- a/eword-encode.el +++ b/eword-encode.el @@ -109,7 +109,7 @@ MODE is allows `text', `comment', `phrase' or nil. Default value is ;;; (defsubst eword-encode-char-type (character) - (if (or (eq character ? )(eq character ?\t)) + (if (memq character '(? ?\t ?\n)) nil (char-charset character) )) diff --git a/mime-def.el b/mime-def.el index b6dfe20..209ecdb 100644 --- a/mime-def.el +++ b/mime-def.el @@ -27,7 +27,7 @@ (require 'mcharset) (eval-and-compile - (defconst mime-library-product ["FLAM-DOODLE" (1 11 1) "$BIrF:Cc(B 5.0R4.0/11.0"] + (defconst mime-library-product ["FLAM-DOODLE" (1 11 2) "$B??