([constant] emacs-version): Don't add a space in the preceding place

of `xemacs-betaname' because it is duplicated.
(emacs-version): Add UTF-2000 version if `utf-2000' is provided.

diff --git a/lisp/version.el b/lisp/version.el
index 914ec3a..3d41ea9 100644 (file)
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -43,9 +43,7 @@ Warning, this variable did not exist in XEmacs versions prior to 20.3")
           (if emacs-patch-level
               (format "(patch %d)" emacs-patch-level)
             "")
-          (if xemacs-betaname
-              (concat " " xemacs-betaname)
-            "")
+          (or xemacs-betaname "")
           (if xemacs-codename
               (concat " \"" xemacs-codename "\"")
             "")
@@ -80,7 +78,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 +87,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 +97,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 " UTF-2000 v" utf-2000-version))
+                 (t ""))
            (substring emacs-build-time 0
                       (string-match " *[0-9]*:" emacs-build-time))
            (substring emacs-build-time