X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fversion.el;h=87c1d795b8836e68fb3eee944eb54c78cdb3de57;hb=5d75177af7b97056f91bae008b85dd479514c657;hp=914ec3abc44fcc517e7602887abd85e9330d906f;hpb=113b194be934327de99a168d809271db252c07c4;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/version.el b/lisp/version.el
index 914ec3a..87c1d79 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -37,19 +37,16 @@ Warning, this variable did not exist in XEmacs versions prior to 20.3")
 
 (defconst emacs-version
   (purecopy
-   (format "%d.%d %s%s%s%s"
+   (format "%d.%d %s%s%s"
 	   emacs-major-version
 	   emacs-minor-version
-	   (if emacs-patch-level
-	       (format "(patch %d)" emacs-patch-level)
+	   (if xemacs-codename
+	       (concat "\"" xemacs-codename "\"")
 	     "")
+	   " XEmacs Lucid"
 	   (if xemacs-betaname
 	       (concat " " xemacs-betaname)
-	     "")
-	   (if xemacs-codename
-	       (concat " \"" xemacs-codename "\"")
-	     "")
-	   " XEmacs Lucid"))
+	     "")))
   "Version numbers of this version of XEmacs.")
 
 (if (featurep 'infodock)
@@ -110,19 +107,16 @@ to the system configuration; look at `system-configuration' instead."
        (t          (insert version-string))))))
 
 ;; from emacs-vers.el
-(defun emacs-version>= (major &optional minor patch)
-  "Return true if the Emacs version is >= to the given MAJOR, MINOR,
-   and PATCH numbers.
-The MAJOR version number argument is required, but the other arguments
-argument are optional. Only the Non-nil arguments are used in the test."
-  (let ((emacs-patch (or emacs-patch-level emacs-beta-version -1)))
-    (cond ((> emacs-major-version major))
-	  ((< emacs-major-version major) nil)
-	  ((null minor))
-	  ((> emacs-minor-version minor))
-	  ((< emacs-minor-version minor) nil)
-	  ((null patch))
-	  ((>= emacs-patch patch)))))
+(defun emacs-version>= (major &optional minor)
+  "Return true if the Emacs version is >= to the given MAJOR and MINOR numbers.
+The MAJOR version number argument is required, but the MINOR version number
+argument is optional.  If the minor version number is not specified (or is the
+symbol `nil') then only the major version numbers are considered in the test."
+  (if (null minor)
+      (>= emacs-major-version major)
+    (or (> emacs-major-version major)
+	(and (=  emacs-major-version major)
+	     (>= emacs-minor-version minor)))))
 
 ;;; We hope that this alias is easier for people to find.
 (define-function 'version 'emacs-version)
@@ -131,7 +125,7 @@ argument are optional. Only the Non-nil arguments are used in the test."
 ;; `what(1)' can extract from the executable or a core file.  We don't
 ;; actually need this to be pointed to from lisp; pure objects can't
 ;; be GCed.
-(or (memq system-type '(windows-nt ms-dos))
+(or (memq system-type '(vax-vms windows-nt ms-dos))
     (purecopy (concat "\n@" "(#)" (emacs-version)
 		      "\n@" "(#)" "Configuration: "
 		      system-configuration "\n")))