* wl-demo.el (wl-demo): Use product.el.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 750b6c5..96d8e95 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -11,6 +11,7 @@
        * wl-fldmgr.el (wl-fldmgr-save-folders): Use `product-string-1'
        for ~/.folders header.
        (wl-fldmgr-folders-header): Changed.
+       * wl-demo.el (wl-demo): Use product.el.
 
        * wl-vars.el (wl-appname, wl-version, wl-codename): Move to
        wl-version.el.

diff --git a/wl/wl-demo.el b/wl/wl-demo.el
index 68edb42..1abec98 100644 (file)
--- a/wl/wl-demo.el
+++ b/wl/wl-demo.el
@@ -33,6 +33,7 @@
   "Copyright (C) 1998-2000 Yuuichi Teranishi <teranisi@gohome.org>")
 
 (require 'wl-vars)
+(require 'wl-version)
 (require 'wl-highlight)
 (provide 'wl-demo)
 
@@ -286,7 +287,7 @@ Optional IMAGE-TYPE overrides the variable `wl-demo-display-logo'."
              (indent-rigidly (point-min) (point-max)
                              (/ (- (* 8 (1+ ww)) lw) 16))))
            (goto-char (point-min)))
-       (insert (or wl-logo-ascii wl-appname))
+       (insert (or wl-logo-ascii (product-name (product-find 'wl-version))))
        (put-text-property (point-min) (point) 'face 'wl-highlight-logo-face)
        (setq rest (- wh (count-lines (point-min) (point)) 1))
        (let ((lw (current-column))
@@ -305,7 +306,9 @@ Optional IMAGE-TYPE overrides the variable `wl-demo-display-logo'."
                               "version %s - \"%s\"\n\n%s")
                              (t
                               "\nversion %s - \"%s\"\n\n%s"))
-                       wl-version wl-codename wl-demo-copyright-notice))
+                       (product-version-string (product-find 'wl-version))
+                       (product-code-name (product-find 'wl-version))
+                       wl-demo-copyright-notice))
        (put-text-property start (point) 'face 'wl-highlight-demo-face)
        (let ((fill-column ww))
          (center-region start (point))))

diff --git a/wl/wl-version.el b/wl/wl-version.el
index 65756c7..1c0678c 100644 (file)
--- a/wl/wl-version.el
+++ b/wl/wl-version.el
@@ -49,7 +49,7 @@
 
 
 ;; for backward compatibility
-(defconst wl-appname  (product-name (product-find 'wl-version)))
+(defconst wl-appname (product-name (product-find 'wl-version)))
 (make-obsolete-variable
  'wl-appname
  "use (product-name (product-find 'wl-version)) insteaed.")