diff lisp/version.el @ 165:5a88923fcbfe r20-3b9

Import from CVS: tag r20-3b9
author cvs
date Mon, 13 Aug 2007 09:44:42 +0200
parents 0132846995bd
children b405438285a2
line wrap: on
line diff
--- a/lisp/version.el	Mon Aug 13 09:43:39 2007 +0200
+++ b/lisp/version.el	Mon Aug 13 09:44:42 2007 +0200
@@ -40,11 +40,16 @@
 
 (defconst emacs-version
   (purecopy
-   (format "%d.%d \"%s\"%s%s"
+   (format "%d.%d %s%s%s"
 	   emacs-major-version
 	   emacs-minor-version
-	   xemacs-codename
-	   " XEmacs Lucid"
+	   (if xemacs-codename
+	       (concat "\"" xemacs-codename "\"")
+	     "")
+	   (concat " XEmacs "
+		   (if (not (featurep 'infodock))
+		       " Lucid"
+		     ""))
 	   (if xemacs-betaname
 	       (concat " " xemacs-betaname)
 	     "")))
@@ -83,8 +88,11 @@
   (interactive "p")
   (let ((version-string
          (format
-	  "XEmacs %s [Lucid] (%s%s) of %s %s on %s"
+	  "XEmacs %s %s(%s%s) of %s %s on %s"
 	  (substring emacs-version 0 (string-match " XEmacs" emacs-version))
+	  (if (not (featurep 'infodock))
+	      "[Lucid] "
+	    "")
 	  system-configuration
 	  (cond ((or (and (fboundp 'featurep)
 			  (featurep 'mule))