diff lisp/version.el @ 239:41f2f0e326e9 r20-5b18

Import from CVS: tag r20-5b18
author cvs
date Mon, 13 Aug 2007 10:15:48 +0200
parents 41ff10fd062f
children c42ec1d1cded
line wrap: on
line diff
--- a/lisp/version.el	Mon Aug 13 10:15:04 2007 +0200
+++ b/lisp/version.el	Mon Aug 13 10:15:48 2007 +0200
@@ -40,18 +40,22 @@
    (format "%d.%d %s%s%s"
 	   emacs-major-version
 	   emacs-minor-version
-	   (if xemacs-codename
+	   (if (and xemacs-codename (not (featurep 'infodock)))
 	       (concat "\"" xemacs-codename "\"")
 	     "")
 	   (concat " XEmacs "
-		   (if (not (featurep 'infodock))
+;;		   (if (not (featurep 'infodock))
 		       " Lucid"
-		     ""))
+;;		     ""))
+		       )
 	   (if xemacs-betaname
 	       (concat " " xemacs-betaname)
 	     "")))
   "Version numbers of this version of XEmacs.")
 
+(if (featurep 'infodock)
+    (require 'id-vers))
+
 ;; Moved to C code as of XEmacs 20.3
 ;(defconst emacs-major-version
 ;  (progn (or (string-match "^[0-9]+" emacs-version)