diff -r -u rail-current/contrib/MEADOW_VERSION rail-current-20040722/contrib/MEADOW_VERSION
--- rail-current/contrib/MEADOW_VERSION 2002-10-20 02:57:42.000000000 +0900
+++ rail-current-20040722/contrib/MEADOW_VERSION 2004-07-22 14:30:28.772425400 +0900
@@ -5,6 +5,7 @@
1.10 TSUYU 露 66段
1.14 AWSAKA 逢坂 62段
1.15 SHOUBU 菖蒲 63段
+2.01 KARUKAYA 刈萱
[Meadow Beta Version names]
diff -r -u rail-current/rail-common.el rail-current-20040722/rail-common.el
--- rail-current/rail-common.el 2002-11-25 23:14:48.000000000 +0900
+++ rail-current-20040722/rail-common.el 2004-07-22 14:20:48.925065500 +0900
@@ -86,23 +86,23 @@
rchar)
(t delimiter))))
(if (looking-at (format rail-meadow-beta-version-header-format delimiter))
- (let* ((b1 (match-beginning 2))
- (e1 (match-end 2))
- (b2 (match-beginning 3))
- (e2 (match-end 3))
- (num (buffer-substring b2 e2))
- (flag (string-match "段" num))
+ (let* ((b1 (match-beginning 5))
+ (e1 (match-end 5))
+ (b2 (match-beginning 6))
+ (e2 (match-end 6))
+ (num (and b2 e2 (buffer-substring b2 e2)))
+ (flag (and num (string-match "段" num)))
(code (buffer-substring b1 e1))
(ccode (rail-assoc code
(append rail-additional-meadow-codename-alist
rail-meadow-codename-alist)
rail-convert-direction)))
(goto-char b1)
- (delete-region b1 e2)
- (insert (or ccode code) new-delimiter num)
- (if flag
- (or rail-convert-direction (delete-backward-char 1))
- (and rail-convert-direction (insert "段"))))
+ (delete-region b1 (or e2 e1))
+ (insert (or ccode code))
+ (when num (insert new-delimiter num))
+ (when flag
+ (or rail-convert-direction (delete-backward-char 1))))
(rail-replace-codename-primitive
rail-mule-version-header-format
rail-additional-meadow-codename-alist rail-meadow-codename-alist)))))
Only in rail-current-20040722: rail-table-meadow.el
Only in rail-current-20040722: rail-table-mule.el
diff -r -u rail-current/rail-vars.el rail-current-20040722/rail-vars.el
--- rail-current/rail-vars.el 2002-10-20 02:57:42.000000000 +0900
+++ rail-current-20040722/rail-vars.el 2004-07-22 14:16:56.030015900 +0900
@@ -68,7 +68,7 @@
;; Meadow beta version format
(defvar rail-meadow-beta-version-header-format
- "\\([.0-9]+\\|[.0-9]+ Beta[0-9]*\\)[ \t\r\n](\\([^()]+\\)%c\\([0-9]+段?\\))"
+ "\\([.0-9]+\\|[.0-9]+ ?\\(Beta\\|Alpha\\|pre\\)[0-9]*\\(-dev\\)?\\|[.0-9]+\\(-dev\\)\\)[ \t\r\n](\\([^()]+\\)\\(%c\\([0-9]+段?\\)\\)?)"
"Format of (Meadow-version) string for Meadow-beta.
This variable is used in rail-replace-codename.")