* elmo-version.el (product-version-as-string): Defined using `defun-maybe'.

(toplevel): Use it.

* elmo-localdir.el (toplevel): Updated copyright notice.
* elmo-version.el (toplevel): Ditto.
* elmo-msgdb.el (toplevel): Ditto.
* elmo-imap4.el (toplevel): Ditto.
* elmo-nntp.el (toplevel): Ditto.
* elmo-pop3.el (toplevel): Ditto.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index a55d575..bf5eae3 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,16 @@
+2000-10-31  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * elmo-version.el (product-version-as-string): Defined using
+       `defun-maybe'.
+       (toplevel): Use it.
+
+       * elmo-localdir.el (toplevel): Updated copyright notice.
+       * elmo-version.el (toplevel): Ditto.
+       * elmo-msgdb.el (toplevel): Ditto.
+       * elmo-imap4.el (toplevel): Ditto.
+       * elmo-nntp.el (toplevel): Ditto.
+       * elmo-pop3.el (toplevel): Ditto.
+
 2000-10-30  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * elmo-pipe.el (elmo-pipe-drain): Don't save msgdb after moving

diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index d806b81..a43c6c5 100644 (file)
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -1,8 +1,14 @@
 ;;; elmo-imap4.el -- IMAP4 Interface for ELMO.
 
 ;; Copyright 1998,1999,2000 Yuuichi Teranishi <teranisi@gohome.org>
-
-;; Author: Yuuichi Teranishi <teranisi@gohome.org>
+;; Copyright 1999,2000      Kenichi OKADA  <okada@opaopa.org>
+;; Copyright 2000           OKAZAKI Tetsurou  <okazaki@be.to>
+;; Copyright 2000           Daiki Ueno  <ueno@unixuser.org>
+
+;; Author: Yuuichi Teranishi <teranisi@gohome.org>,
+;;         Kenichi OKADA  <okada@opaopa.org>,
+;;         OKAZAKI Tetsurou  <okazaki@be.to>,
+;;         Daiki Ueno  <ueno@unixuser.org>,
 ;; Keywords: mail, net news
 
 ;; This file is part of ELMO (Elisp Library for Message Orchestration).

diff --git a/elmo/elmo-localdir.el b/elmo/elmo-localdir.el
index 33dc9ee..46ba23c 100644 (file)
--- a/elmo/elmo-localdir.el
+++ b/elmo/elmo-localdir.el
@@ -1,8 +1,12 @@
 ;;; elmo-localdir.el -- Localdir Interface for ELMO.
 
 ;; Copyright 1998,1999,2000 Yuuichi Teranishi <teranisi@gohome.org>
+;;                          Masahiro MURATA  <muse@ba2.so-net.ne.jp>
+;; Copyright 1999,2000      Kenichi OKADA  <okada@opaopa.org>
 
-;; Author: Yuuichi Teranishi <teranisi@gohome.org>
+;; Author: Yuuichi Teranishi <teranisi@gohome.org>,
+;;         Masahiro MURATA  <muse@ba2.so-net.ne.jp>,
+;;         Kenichi OKADA  <okada@opaopa.org>
 ;; Keywords: mail, net news
 
 ;; This file is part of ELMO (Elisp Library for Message Orchestration).

diff --git a/elmo/elmo-msgdb.el b/elmo/elmo-msgdb.el
index 5d314ca..b845fe6 100644 (file)
--- a/elmo/elmo-msgdb.el
+++ b/elmo/elmo-msgdb.el
@@ -1,8 +1,10 @@
 ;;; elmo-msgdb.el -- Message Database for Elmo.
 
 ;; Copyright 1998,1999,2000 Yuuichi Teranishi <teranisi@gohome.org>
+;; Copyright 2000           Masahiro MURATA  <muse@ba2.so-net.ne.jp>
 
-;; Author: Yuuichi Teranishi <teranisi@gohome.org>
+;; Author: Yuuichi Teranishi <teranisi@gohome.org>,
+;;         Masahiro MURATA  <muse@ba2.so-net.ne.jp>
 ;; Keywords: mail, net news
 
 ;; This file is part of ELMO (Elisp Library for Message Orchestration).

diff --git a/elmo/elmo-nntp.el b/elmo/elmo-nntp.el
index 4b0aeed..64903ab 100644 (file)
--- a/elmo/elmo-nntp.el
+++ b/elmo/elmo-nntp.el
@@ -1,8 +1,12 @@
 ;;; elmo-nntp.el -- NNTP Interface for ELMO.
 
 ;; Copyright 1998,1999,2000 Yuuichi Teranishi <teranisi@gohome.org>
+;;                          Masahiro MURATA  <muse@ba2.so-net.ne.jp>
+;; Copyright 1999,2000      Kenichi OKADA  <okada@opaopa.org>
 
-;; Author: Yuuichi Teranishi <teranisi@gohome.org>
+;; Author: Yuuichi Teranishi <teranisi@gohome.org>,
+;;         Masahiro MURATA  <muse@ba2.so-net.ne.jp>,
+;;         Kenichi OKADA  <okada@opaopa.org>
 ;; Keywords: mail, net news
 
 ;; This file is part of ELMO (Elisp Library for Message Orchestration).

diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index 87ead02..dbd3268 100644 (file)
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -1,8 +1,10 @@
 ;;; elmo-pop3.el -- POP3 Interface for ELMO.
 
 ;; Copyright 1998,1999,2000 Yuuichi Teranishi <teranisi@gohome.org>
+;; Copyright 1999,2000      Kenichi OKADA  <okada@opaopa.org>
 
-;; Author: Yuuichi Teranishi <teranisi@gohome.org>
+;; Author: Yuuichi Teranishi <teranisi@gohome.org>,
+;;         Kenichi OKADA  <okada@opaopa.org>
 ;; Keywords: mail, net news
 
 ;; This file is part of ELMO (Elisp Library for Message Orchestration).

diff --git a/elmo/elmo-version.el b/elmo/elmo-version.el
index b376beb..c11c220 100644 (file)
--- a/elmo/elmo-version.el
+++ b/elmo/elmo-version.el
@@ -1,8 +1,10 @@
 ;;; elmo-version.el -- Version information for ELMO.
 
 ;; Copyright 2000 Yuuichi Teranishi <teranisi@gohome.org>
+;;                TAKAHASHI Kaoru <kaoru@kaisei.org>
 
 ;; Author: Yuuichi Teranishi <teranisi@gohome.org>
+;;         TAKAHASHI Kaoru <kaoru@kaisei.org>
 ;; Keywords: mail, net news
 
 ;; This file is part of ELMO (Elisp Library for Message Orchestration).
@@ -31,13 +33,25 @@
 (require 'product)
 (provide 'elmo-version)                        ; have to declare in the top.
 
+;; For APEL 10.2 or earlier.
+(defun-maybe product-version-as-string (product)
+  "Return version number of product as a string.
+PRODUCT is a product structure which returned by `product-define'.
+If optional argument UPDATE is non-nil, then regenerate
+`produce-version-string' from `product-version'."
+  (setq product (product-find product))
+  (or (product-version-string product)
+      (and (product-version product)
+           (product-set-version-string product
+                                       (mapconcat (function int-to-string)
+                                                  (product-version product)
+                                                  ".")))))
+
 (product-provide 'elmo-version
   (product-define "ELMO" nil '(2 3 92)))
 
 ;; set version-string
-(if (fboundp 'product-version-as-string)
-    (product-version-as-string 'elmo-version)
-  (product-string-1 'elmo-version))    ; APEL 10.2 or earlier
+(product-version-as-string 'elmo-version)
 
 (defun elmo-version ()
   "Return ELMO version."