update.

[chise/xemacs-chise.git.1] / lisp / version.el

diff --git a/lisp/version.el b/lisp/version.el
index d913142..7f74440 100644 (file)
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -36,20 +36,17 @@
 Warning, this variable did not exist in XEmacs versions prior to 20.3")
 
 (defconst emacs-version
-  (purecopy
-   (format "%d.%d %s%s%s%s"
-          emacs-major-version
-          emacs-minor-version
-          (if emacs-patch-level
-              (format "(patch %d)" emacs-patch-level)
-            "")
-          (if xemacs-betaname
-              (concat " " xemacs-betaname)
-            "")
-          (if xemacs-codename
-              (concat " \"" xemacs-codename "\"")
-            "")
-          " XEmacs Lucid"))
+  (format "%d.%d %s%s%s%s"
+         emacs-major-version
+         emacs-minor-version
+         (if emacs-patch-level
+             (format "(patch %d)" emacs-patch-level)
+           "")
+         (or xemacs-betaname "")
+         (if xemacs-codename
+             (concat " \"" xemacs-codename "\"")
+           "")
+         " XEmacs Lucid")
   "Version numbers of this version of XEmacs.")
 
 (if (featurep 'infodock)
@@ -80,7 +77,7 @@ Warning, this variable did not exist in XEmacs versions prior to 20.3")
 
 (defconst emacs-build-system (system-name))
 
-(defun emacs-version  (&optional arg)
+(defun emacs-version (&optional arg)
   "Return string describing the version of Emacs that is running.
 When called interactively with a prefix argument, insert string at point.
 Don't use this function in programs to choose actions according
@@ -89,7 +86,7 @@ to the system configuration; look at `system-configuration' instead."
   (save-match-data
     (let ((version-string
           (format
-           "XEmacs %s %s(%s%s) of %s %s on %s"
+           "XEmacs %s %s(%s%s)%s of %s %s on %s"
            (substring emacs-version 0 (string-match " XEmacs" emacs-version))
            (if (not (featurep 'infodock))
                "[Lucid] "
@@ -99,6 +96,11 @@ to the system configuration; look at `system-configuration' instead."
                            (featurep 'mule))
                       (memq 'mule features)) ", Mule")
                  (t ""))
+           (cond ((or (and (fboundp 'featurep)
+                           (featurep 'utf-2000))
+                      (memq 'utf-2000 features))
+                  (concat "  CHISE v" xemacs-chise-version))
+                 (t ""))
            (substring emacs-build-time 0
                       (string-match " *[0-9]*:" emacs-build-time))
            (substring emacs-build-time
@@ -131,9 +133,9 @@ argument are optional. Only the Non-nil arguments are used in the test."
 ;; `what(1)' can extract from the executable or a core file.  We don't
 ;; actually need this to be pointed to from lisp; pure objects can't
 ;; be GCed.
-(purecopy (concat "\n@" "(#)" (emacs-version)
-                 "\n@" "(#)" "Configuration: "
-                 system-configuration "\n"))
+(concat "\n@" "(#)" (emacs-version)
+       "\n@" "(#)" "Configuration: "
+       system-configuration "\n")
 
 ;;Local variables:
 ;;version-control: never