From 66e3b0b7fcbdcacf961e9cd9035971840ce4987d Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 26 Aug 2002 22:46:38 +0000 Subject: [PATCH] Synch with the flim-1_14 branch. --- ChangeLog | 48 +++++++++++++++++++++++++++++------------------- VERSION | 13 ++++++++++--- mime-def.el | 2 +- std11.el | 29 +++++++++++++++++++++-------- 4 files changed, 61 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index 68aa3bb..b6e5e21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2002-08-26 MORIOKA Tomohiko + + * std11.el: Update Copyright header. + +2002-07-30 MORIOKA Tomohiko + + * std11.el (std11-non-atom-regexp): New constant. + (std11-analyze-atom): New implementation to avoid error in current + XEmacs UTF-2000 [may be caused by a bug about regexp]. + 2002-07-26 Katsumi Yamaoka * smtp.el (smtp-open-connection-function): Add doc. @@ -13,7 +23,7 @@ 2002-06-03 MORIOKA Tomohiko - * FLIM: Version 1.14.4 (Kashiharajing-Dþ-mae) released.-A + * FLIM: Version 1.14.4 (Kashiharajing-Dþ-mae)-A released. 2002-01-16 Hiroya Murata @@ -51,7 +61,7 @@ 2001-06-01 MORIOKA Tomohiko - * FLIM: Version 1.14.3 (Unebigory-Dòmae) released.-A + * FLIM: Version 1.14.3 (Unebigory-Dòmae)-A released. 2001-06-01 Katsumi Yamaoka @@ -1047,7 +1057,7 @@ 2000-07-12 MORIOKA Tomohiko - * FLIM-Chao: Version 1.14.1 (Rokujiz-Dò) released.-A + * FLIM-Chao: Version 1.14.1 (Rokujiz-Dò)-A released. 2000-07-10 MORIOKA Tomohiko @@ -1825,7 +1835,7 @@ 1999-05-31 MORIOKA Tomohiko - * FLIM: Version 1.12.7 (Y-Dþzaki) released.-A + * FLIM: Version 1.12.7 (Y-Dþzaki)-A released. 1999-05-31 MORIOKA Tomohiko @@ -2000,7 +2010,7 @@ 1999-05-11 MORIOKA Tomohiko - * FLIM: Version 1.12.6 (Family-K-Dòenmae) released.-A + * FLIM: Version 1.12.6 (Family-K-Dòenmae)-A released. 1999-04-27 Shuhei KOBAYASHI @@ -2117,7 +2127,7 @@ 1999-01-23 MORIOKA Tomohiko - * FLIM: Version 1.12.3 (Kintetsu-K-Dòriyama) released.-A + * FLIM: Version 1.12.3 (Kintetsu-K-Dòriyama)-A released. 1999-01-23 MORIOKA Tomohiko @@ -2160,7 +2170,7 @@ 1999-01-21 MORIOKA Tomohiko - * FLIM: Version 1.12.2 (Kuj-Dò) released.-A + * FLIM: Version 1.12.2 (Kuj-Dò)-A released. 1999-01-16 MORIOKA Tomohiko @@ -2346,7 +2356,7 @@ 1998-12-02 MORIOKA Tomohiko - * FLIM: Version 1.12.1 (Nishinoky-Dò) released.-A + * FLIM: Version 1.12.1 (Nishinoky-Dò)-A released. 1998-11-30 MORIOKA Tomohiko @@ -2564,7 +2574,7 @@ 1998-10-26 MORIOKA Tomohiko - * FLIM: Version 1.11.2 (Heij-Dò) was released.-A + * FLIM: Version 1.11.2 (Heij-Dò)-A was released. * NEWS (Abolish variable `mime-temp-directory'): New subsection. @@ -2844,7 +2854,7 @@ 1998-10-12 MORIOKA Tomohiko - * FLIM: Version 1.10.4 (Shin-H-Dòsono) was released.-A + * FLIM: Version 1.10.4 (Shin-H-Dòsono)-A was released. 1998-10-12 Katsumi Yamaoka @@ -3029,7 +3039,7 @@ 1998-09-29 MORIOKA Tomohiko - * FLIM: Version 1.10.0 (K-Dòdo) was released.-A + * FLIM: Version 1.10.0 (K-Dòdo)-A was released. * README.en (What's FLIM): Add mel-ccl.el. @@ -3316,7 +3326,7 @@ 1998-08-31 MORIOKA Tomohiko - * FLIM: Version 1.9.1 (Tonosh-Dò) was released.-A + * FLIM: Version 1.9.1 (Tonosh-Dò)-A was released. * mime-en.sgml (mm-backend): Translate a little. @@ -3459,7 +3469,7 @@ 1998-07-07 MORIOKA Tomohiko - * FLIM-Chao: Version 1.8.0 (Shij-Dò) was released.-A + * FLIM-Chao: Version 1.8.0 (Shij-Dò)-A was released. 1998-07-07 MORIOKA Tomohiko @@ -3571,7 +3581,7 @@ 1998-07-01 MORIOKA Tomohiko - * FLIM: Version 1.8.0 (-DÒkubo) was released.-A + * FLIM: Version 1.8.0 (-DÒkubo)-A was released. * README.en: Delete `How to use'. @@ -3696,7 +3706,7 @@ 1998-06-28 MORIOKA Tomohiko - * FLIM-Chao: Version 1.7.0 (Goj-Dò) was released.-A + * FLIM-Chao: Version 1.7.0 (Goj-Dò)-A was released. 1998-06-26 MORIOKA Tomohiko @@ -3955,7 +3965,7 @@ 1998-06-19 MORIOKA Tomohiko - * FLIM: Version 1.4.1 (Momoyama-Gory-Dòmae) was released.-A + * FLIM: Version 1.4.1 (Momoyama-Gory-Dòmae)-A was released. 1998-06-18 MORIOKA Tomohiko @@ -4075,7 +4085,7 @@ 1998-05-06 MORIOKA Tomohiko - * FLIM: Version 1.2.0 (J-Dþjò) was released.-A + * FLIM: Version 1.2.0 (J-Dþjò)-A was released. * README.en (What's FLIM): Delete description about std11-parse.el; add description about mailcap.el. @@ -4126,7 +4136,7 @@ 1998-05-05 MORIOKA Tomohiko - * FLIM: Version 1.1.0 (T-Dòji) was released.-A + * FLIM: Version 1.1.0 (T-Dòji)-A was released. 1998-05-04 MORIOKA Tomohiko @@ -4162,7 +4172,7 @@ 1998-04-17 MORIOKA Tomohiko - * FLIM: Version 1.0.1 (Ky-Dòto) was released.-A + * FLIM: Version 1.0.1 (Ky-Dòto)-A was released. * mime-def.el (mime-spadework-module-version-string): New constant. diff --git a/VERSION b/VERSION index 23955f1..745aab0 100644 --- a/VERSION +++ b/VERSION @@ -4,7 +4,7 @@ ;;------------------------------------------------------------------------- ;; Kinki Nippon Railway $(B6a5&F|K\E4F;(B http://www.kintetsu.co.jp/ -;; Ky-Dòto Line-A $(B5~ET@~(B +;; 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 @@ -34,7 +34,7 @@ 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 Line-A $(B3`86@~(B +;; Ky-Dòto-A Line $(B3`86@~(B ;;------------------------------------------------------------------------- (Saidaiji) ($(B@>Bg;{(B) 1.12.0 Amagatsuji $(BFt%vDT(B @@ -55,6 +55,13 @@ 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 + + [Chao Version names] ;;------------------------------------------------------------------------- @@ -117,7 +124,7 @@ 1.14.0 Gokend-Dò-A $B8^4VF2(B 1.14.3 Terai-Nishikuchi $B;{0f@>8}(B 1.14.4 Jid-Dò-Asha-Renraku $B<+F0 ;; Keywords: mail, news, RFC 822, STD 11 @@ -291,6 +291,11 @@ be the result." ) ;; (defconst std11-spaces-regexp ;; (eval-when-compile (concat "[" std11-space-char-list "]+"))) + +(defconst std11-non-atom-regexp + (eval-when-compile + (concat "[" std11-special-char-list std11-space-char-list "]"))) + (defconst std11-atom-regexp (eval-when-compile (concat "[^" std11-special-char-list std11-space-char-list "]+"))) @@ -315,13 +320,21 @@ be the result." )) (defun std11-analyze-atom (string start) - (if (and (string-match std11-atom-regexp string start) - (= (match-beginning 0) start)) - (let ((end (match-end 0))) - (cons (cons 'atom (substring string start end)) - ;;(substring string end) - end) - ))) + (if (string-match std11-non-atom-regexp string start) + (if (> (match-beginning 0) start) + (cons (cons 'atom (substring string start (match-beginning 0))) + (match-beginning 0)) + nil) + (cons (cons 'atom (substring string start)) + (length string))) + ;; (if (and (string-match std11-atom-regexp string start) + ;; (= (match-beginning 0) start)) + ;; (let ((end (match-end 0))) + ;; (cons (cons 'atom (substring string start end)) + ;; ;;(substring string end) + ;; end) + ;; )) + ) (defun std11-check-enclosure (string open close &optional recursive from) (let ((len (length string)) -- 1.7.10.4