(mime-edit-version): Renamed from `mime-edit-version-string'; use

`mime-user-interface-product', `mime-product-name',
`mime-product-version' and `mime-product-code-name'.
(mime-edit-user-agent-value): Use `mime-user-interface-product',
`mime-library-product', `mime-product-name', `mime-product-version'
and `mime-product-code-name'.
(mime-edit-mime-version-value): Rename `mime-edit-version-string' ->
`mime-edit-version'.
(mime-edit-mime-version-field-for-message/partial): Likewise.

diff --git a/mime-edit.el b/mime-edit.el
index d5c3f07..6bb5135 100644 (file)
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -119,11 +119,13 @@
 ;;; @ version
 ;;;
 
-(defconst mime-edit-version-string
-  `,(concat (car mime-user-interface-version) " "
-           (mapconcat #'number-to-string
-                      (cddr mime-user-interface-version) ".")
-           " - \"" (cadr mime-user-interface-version) "\""))
+(defconst mime-edit-version
+  (eval-when-compile
+    (concat
+     (mime-product-name mime-user-interface-product) " "
+     (mapconcat #'number-to-string
+               (mime-product-version mime-user-interface-product) ".")
+     " - \"" (mime-product-code-name mime-user-interface-product) "\"")))
 
 
 ;;; @ variables
@@ -561,19 +563,19 @@ If it is not specified for a major-mode,
   "*If non-nil, insert User-Agent header field.")
 
 (defvar mime-edit-user-agent-value
-  (concat (car mime-user-interface-version)
+  (concat (mime-product-name mime-user-interface-product)
          "/"
          (mapconcat #'number-to-string
-                    (cddr mime-user-interface-version) ".")
+                    (mime-product-version mime-user-interface-product) ".")
          " ("
-         (cadr mime-user-interface-version)
+         (mime-product-code-name mime-user-interface-product)
          ") "
-         (car mime-library-version)
+         (mime-product-name mime-library-product)
          "/"
          (mapconcat #'number-to-string
-                    (cddr mime-library-version) ".")
+                    (mime-product-version mime-library-product) ".")
          " ("
-         (cadr mime-library-version)
+         (mime-product-code-name mime-library-product)
          ") "
          (if (featurep 'xemacs)
              (concat (if (featurep 'mule) "MULE")
@@ -618,11 +620,13 @@ inserted into message header.")
 Tspecials means any character that matches with it in header must be quoted.")
 
 (defconst mime-edit-mime-version-value
-  (concat "1.0 (generated by " mime-edit-version-string ")")
+  (eval-when-compile
+    (concat "1.0 (generated by " mime-edit-version ")"))
   "MIME version number.")
 
 (defconst mime-edit-mime-version-field-for-message/partial
-  (concat "MIME-Version: 1.0 (split by " mime-edit-version-string ")\n")
+  (eval-when-compile
+    (concat "MIME-Version: 1.0 (split by " mime-edit-version ")\n"))
   "MIME version field for message/partial.")