From: okada <okada>
Date: Tue, 27 Aug 2002 05:24:59 +0000 (+0000)
Subject: Synch with the flim-1_14 branch.
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aee1620e19022f573c39706e1754c9208afc93ab;p=elisp%2Fflim.git

Synch with the flim-1_14 branch.
---

diff --git a/ChangeLog b/ChangeLog
index 9b6fb50..2bfa0b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-08-26  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
+
+	* std11.el: Update Copyright header.
+
+2002-07-30  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
+
+	* 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   <yamaoka@jpl.org>
 
 	* smtp.el (smtp-open-connection-function): Add doc.
diff --git a/VERSION b/VERSION
index f4e88e1..5c5a4f0 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]
 
 ;;-------------------------------------------------------------------------
diff --git a/std11.el b/std11.el
index 97f9359..246181f 100644
--- a/std11.el
+++ b/std11.el
@@ -1,6 +1,6 @@
 ;;; std11.el --- STD 11 functions for GNU Emacs
 
-;; Copyright (C) 1995,1996,1997,1998,1999,2000 Free Software Foundation, Inc.
+;; Copyright (C) 1995,96,97,98,99,2000,01,02 Free Software Foundation, Inc.
 
 ;; Author:   MORIOKA Tomohiko <tomo@m17n.org>
 ;; Keywords: mail, news, RFC 822, STD 11
@@ -289,6 +289,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 "]+")))
@@ -313,13 +318,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))