* wl-version.el (wl-extended-emacs-version,

wl-extended-emacs-version2, wl-extended-emacs-version3): Use
`elmo-match-string' instead of `wl-match-string'.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 3fc0629..4b5cc6e 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-19  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+       * wl-version.el (wl-extended-emacs-version,
+       wl-extended-emacs-version2, wl-extended-emacs-version3): Use
+       `elmo-match-string' instead of `wl-match-string'.
+
 2000-12-15  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
        * wl-summary.el (wl-summary-mode): Use \\{wl-summary-mode-map} in

diff --git a/wl/wl-version.el b/wl/wl-version.el
index edd6917..3eecb2a 100644 (file)
--- a/wl/wl-version.el
+++ b/wl/wl-version.el
@@ -32,6 +32,8 @@
 ;;
 (require 'product)
 (require 'elmo-version)                        ; product-version-as-string
+(eval-when-compile
+  (require 'elmo-util))                        ; elmo-match-string
 (provide 'wl-version)                  ; before product-provide
 
 ;; product-define in the first place
@@ -45,9 +47,6 @@
 ;; set version-string
 (product-version-as-string 'wl-version)
 
-;; require wl-util after product-provide.
-(eval-when-compile (require 'wl-util)) ; wl-match-string
-
 (defun wl-version (&optional with-codename)
   "Return Wanderlust version.
 If WITH-CODENAME add codename."
@@ -140,11 +139,11 @@ If VERBOSE return with SEMI, FLIM and APEL version."
 If WITH-CODENAME add XEmacs codename."
   (cond
    ((string-match "^\\([0-9]+\\.[0-9]+\\)\\.[.0-9]+$" emacs-version)
-    (concat "Emacs " (wl-match-string 1 emacs-version)
+    (concat "Emacs " (elmo-match-string 1 emacs-version)
            (when (boundp 'mule-version) (concat "/Mule " mule-version))))
    ((string-match "\\([A-Z]*[Mm][Aa][Cc][Ss]\\)[^(]*\\(\\((beta.*)\\|'\\)\\)?"
                  emacs-version)
-    (concat (wl-match-string 1 emacs-version)
+    (concat (elmo-match-string 1 emacs-version)
            (format " %d.%d" emacs-major-version emacs-minor-version)
            (when (and (boundp 'emacs-beta-version) emacs-beta-version)
              (format "b%d" emacs-beta-version))
@@ -161,11 +160,11 @@ Separate DELIMITER (default is \" \").  If WITH-CODENAME add XEmacs codename."
         (string-match "\\([0-9]+\.[0-9]+\\)\\(.*$\\)" mule-version))
     (format "Mule%s%s@%d.%d%s"
            (or delimiter " ")
-           (wl-match-string 1 mule-version)
+           (elmo-match-string 1 mule-version)
            emacs-major-version
            emacs-minor-version
            (if with-codename
-               (wl-match-string 2 mule-version)
+               (elmo-match-string 2 mule-version)
              "")))
    ((string-match "^\\([0-9]+\\.[0-9]+\\)\\.[.0-9]+$" emacs-version)
     (if (boundp 'nemacs-version)
@@ -176,10 +175,10 @@ Separate DELIMITER (default is \" \").  If WITH-CODENAME add XEmacs codename."
                           (match-beginning 1)
                           (match-end 1)))
       (concat "Emacs" (or delimiter " ")
-             (wl-match-string 1 emacs-version))))
+             (elmo-match-string 1 emacs-version))))
    ((string-match "\\([A-Z]*[Mm][Aa][Cc][Ss]\\)[^(]*\\(\\((beta.*)\\|'\\)\\)?"
                  emacs-version)
-    (concat (wl-match-string 1 emacs-version)
+    (concat (elmo-match-string 1 emacs-version)
            (or delimiter " ")
            (format "%d.%d" emacs-major-version emacs-minor-version)
            (when (and (boundp 'emacs-beta-version) emacs-beta-version)
@@ -200,9 +199,9 @@ Separate DELIMITER (default is \" \").  If WITH-CODENAME add XEmacs codename."
            emacs-major-version
            emacs-minor-version
            (or delimiter " ")
-           (wl-match-string 1 mule-version)
+           (elmo-match-string 1 mule-version)
            (if with-codename
-               (wl-match-string 2 mule-version)
+               (elmo-match-string 2 mule-version)
              "")))
    ((string-match "^\\([0-9]+\\.[0-9]+\\)\\.[.0-9]+$" emacs-version)
     (if (boundp 'nemacs-version)
@@ -211,7 +210,7 @@ Separate DELIMITER (default is \" \").  If WITH-CODENAME add XEmacs codename."
                                       ("3.2.3" . " (YUMENO-AWAYUKI)"))))
          (format "Emacs%s%s Nemacs%s%s%s"
                  (or delimiter " ")
-                 (wl-match-string 1 emacs-version)
+                 (elmo-match-string 1 emacs-version)
                  (or delimiter " ")
                  nemacs-version
                  (or (and with-codename
@@ -219,10 +218,10 @@ Separate DELIMITER (default is \" \").  If WITH-CODENAME add XEmacs codename."
                                       nemacs-codename-assoc)))
                      "")))
       (concat "Emacs" (or delimiter " ")
-             (wl-match-string 1 emacs-version))))
+             (elmo-match-string 1 emacs-version))))
    ((string-match "\\([A-Z]*[Mm][Aa][Cc][Ss]\\)[^(]*\\(\\((beta.*)\\|'\\)\\)?"
                  emacs-version)
-    (concat (wl-match-string 1 emacs-version)
+    (concat (elmo-match-string 1 emacs-version)
            (or delimiter " ")
            (format "%d.%d" emacs-major-version emacs-minor-version)
            (when (and (boundp 'emacs-beta-version) emacs-beta-version)