diff lisp/version.el @ 140:585fb297b004 r20-2b4

Import from CVS: tag r20-2b4
author cvs
date Mon, 13 Aug 2007 09:32:43 +0200
parents 6608ceec7cf8
children 1856695b1fa9
line wrap: on
line diff
--- a/lisp/version.el	Mon Aug 13 09:31:48 2007 +0200
+++ b/lisp/version.el	Mon Aug 13 09:32:43 2007 +0200
@@ -25,7 +25,7 @@
 (defconst emacs-version "20.2"
   "Version numbers of this version of Emacs.")
 
-(setq emacs-version (purecopy (concat emacs-version " XEmacs Lucid (beta3)")))
+(setq emacs-version (purecopy (concat emacs-version " XEmacs Lucid (beta4)")))
 
 (defconst emacs-major-version
   (progn (or (string-match "^[0-9]+" emacs-version)
@@ -61,7 +61,10 @@
 	  "XEmacs %s [Lucid] (%s%s) of %s %s on %s"
 	  (substring emacs-version 0 (string-match " XEmacs" emacs-version))
 	  system-configuration
-	  (cond ((featurep 'mule) ", Mule") (t ""))
+	  (cond ((or (and (fboundp 'featurep)
+			  (featurep 'mule))
+		     (memq 'mule features)) ", Mule")
+		(t ""))
 	  (substring emacs-build-time 0
 		     (string-match " *[0-9]*:" emacs-build-time))
 	  (substring emacs-build-time