From ae2c047f301b641414c20b1577cb6f25b7ffa9d0 Mon Sep 17 00:00:00 2001
From: yoichi <yoichi>
Date: Tue, 29 Oct 2002 01:11:04 +0000
Subject: [PATCH] sync with wl-2_10 branch

---
 doc/TODO           |    2 +-
 doc/TODO.ja        |    2 +-
 doc/wl-ja.texi     |    2 +-
 doc/wl.texi        |    2 +-
 tests/ChangeLog    |    5 +++++
 tests/test-dist.el |   26 ++++++++++++++++++++++++++
 6 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/doc/TODO b/doc/TODO
index a25feb2..7ad2308 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,4 @@
-* tasks in 2.9.x
+* tasks in 2.11.x
 
 ** enable to define folder icons in elmo.el
 ** reconsider the structure of msgdb and make behavior faster
diff --git a/doc/TODO.ja b/doc/TODO.ja
index f47a14d..7d76aa1 100644
--- a/doc/TODO.ja
+++ b/doc/TODO.ja
@@ -1,4 +1,4 @@
-* 2.9.x の TODO 
+* 2.11.x の TODO 
 
 ** elmo.el でフォルダのアイコンを定義できるようにする
 ** msgdb の構造を見直し、高速化をはかる
diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi
index 925051d..73148a3 100644
--- a/doc/wl-ja.texi
+++ b/doc/wl-ja.texi
@@ -6266,7 +6266,7 @@ pop3                    ×    △    △    △
 	;; @r{wanderlust メーリングリストからのメールを @samp{%wanderlust} へ}
 	;; @r{そして続けてそれ以下の規則も評価する。}
 	((equal x-ml-name "wanderlust") "%wanderlust" continue)
-	;; @r{Yahoo 利用者からのメッセージを @samp{+yahoo-{username}} へ}
+	;; @r{Yahoo 利用者からのメッセージを @samp{+yahoo-@{username@}} へ}
 	((match from "\\(.*\\)@@yahoo\\.com")
 	 "+yahoo-\\1")
 	;; @r{マッチしなかった残りを @samp{+inbox} へ}
diff --git a/doc/wl.texi b/doc/wl.texi
index ccff474..31be990 100644
--- a/doc/wl.texi
+++ b/doc/wl.texi
@@ -6355,7 +6355,7 @@ example, please.
 	;; @r{Store messages from wanderlust mailing list into @samp{%wanderlust}}
 	;; @r{and continue evaluating following rules}
 	((equal x-ml-name "wanderlust") "%wanderlust" continue)
-	;; @r{Store messages from Yahoo user into @samp{+yahoo-{username}}}
+	;; @r{Store messages from Yahoo user into @samp{+yahoo-@{username@}}}
 	((match from "\\(.*\\)@@yahoo\\.com")
 	 "+yahoo-\\1")
 	;; @r{Store unmatched mails into @samp{+inbox}}
diff --git a/tests/ChangeLog b/tests/ChangeLog
index a3a9854..58d1ae9 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-27  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+	* test-dist.el (test-version-readme): New testcase.
+	(test-wl-demo-copyright-notice): Ditto.
+
 2002-10-24  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
 	* check-modules.el (check-modules-flim-content-transfer-encoding):
diff --git a/tests/test-dist.el b/tests/test-dist.el
index 91a98f6..9e51553 100644
--- a/tests/test-dist.el
+++ b/tests/test-dist.el
@@ -137,3 +137,29 @@
        (string=
 	(product-code-name (product-find 'wl-version))
 	(match-string 2))))))
+
+;; README, README.ja (toplevel)
+(luna-define-method test-version-readme ((case test-dist))
+  (require 'wl-version)
+  (when (string= (wl-version-status) "stable")
+    (mapc
+     (lambda (file)
+       (with-temp-buffer
+	 (insert-file-contents (expand-file-name file "./"))
+	 (re-search-forward "checkout -r wl-\\([0-9]+\\)_\\([0-9]+\\) wanderlust")
+	 (lunit-assert
+	  (= (string-to-number (match-string 1))
+	     (nth 0 (product-version (product-find 'wl-version)))))
+	 (lunit-assert
+	  (= (string-to-number (match-string 2))
+	     (nth 1 (product-version (product-find 'wl-version)))))))
+     '("README" "README.ja"))))
+
+;; copyright notice (beta only)
+(luna-define-method test-wl-demo-copyright-notice ((case test-dist))
+  (require 'wl-demo)
+  (when (string= (wl-version-status) "beta")
+    (lunit-assert
+     (string-match
+      (format-time-string "%Y" (current-time))
+      wl-demo-copyright-notice))))
-- 
1.7.10.4