X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fversion.el;h=7f744406eddb5a3a24d74c53a378259140471771;hb=9ddf88dc7c6b309bd4bd1687ee7984451246fd9f;hp=d2bc8948e66c0c23b4762246eb04b19098f8cf13;hpb=98a6e4055a1fa624c592ac06f79287d55196ca37;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/version.el b/lisp/version.el
index d2bc894..7f74440 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -42,9 +42,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 "\"")
 	    "")
@@ -79,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
@@ -88,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] "
@@ -98,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