sync with wl-2_10 branch

diff --git a/doc/TODO b/doc/TODO
index a25feb2..7ad2308 100644 (file)
--- 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 (file)
--- a/doc/TODO.ja
+++ b/doc/TODO.ja
@@ -1,4 +1,4 @@
-* 2.9.x \e$B$N\e(B TODO 
+* 2.11.x \e$B$N\e(B TODO 
 
 ** elmo.el \e$B$G%U%)%k%@$N%"%$%3%s$rDj5A$G$-$k$h$&$K$9$k\e(B
 ** msgdb \e$B$N9=B$$r8+D>$7!"9bB.2=$r$O$+$k\e(B

diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi
index 925051d..73148a3 100644 (file)
--- a/doc/wl-ja.texi
+++ b/doc/wl-ja.texi
@@ -6266,7 +6266,7 @@ pop3                    \e$B!_\e(B    \e$B"$\e(B    \e$B"$\e(B    \e$B"$\e(B
        ;; @r{wanderlust \e$B%a!<%j%s%0%j%9%H$+$i$N%a!<%k$r\e(B @samp{%wanderlust} \e$B$X\e(B}
        ;; @r{\e$B$=$7$FB3$1$F$=$l0J2<$N5,B'$bI>2A$9$k!#\e(B}
        ((equal x-ml-name "wanderlust") "%wanderlust" continue)
-       ;; @r{Yahoo \e$BMxMQ<T$+$i$N%a%C%;!<%8$r\e(B @samp{+yahoo-{username}} \e$B$X\e(B}
+       ;; @r{Yahoo \e$BMxMQ<T$+$i$N%a%C%;!<%8$r\e(B @samp{+yahoo-@{username@}} \e$B$X\e(B}
        ((match from "\\(.*\\)@@yahoo\\.com")
         "+yahoo-\\1")
        ;; @r{\e$B%^%C%A$7$J$+$C$?;D$j$r\e(B @samp{+inbox} \e$B$X\e(B}

diff --git a/doc/wl.texi b/doc/wl.texi
index ccff474..31be990 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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))))