From af988c95fa394f22ae65c35a4565df93465d578b Mon Sep 17 00:00:00 2001 From: tomo Date: Mon, 30 Aug 1999 16:56:07 +0000 Subject: [PATCH] ([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. --- lisp/version.el | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lisp/version.el b/lisp/version.el index 914ec3a..3d41ea9 100644 --- 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 -- 1.7.10.4