diff lisp/subr.el @ 90233:ee12d75eb214

Revision: [e-mail]--gnu-2005/emacs--unicode--0--patch-85 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 556-561) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 122-124) - Update from CVS: lisp/mm-url.el (mm-url-decode-entities): Fix regexp. - Update from CVS

--- a/lisp/subr.el	Fri Sep 23 07:06:33 2005 +0000
+++ b/lisp/subr.el	Sun Sep 25 22:07:01 2005 +0000
@@ -2862,9 +2862,11 @@
 
 
 (defvar version-regexp-alist
-  '(("^a\\(lpha\\)?$"   . -3)
-    ("^b\\(eta\\)?$"    . -2)
-    ("^\\(pre\\|rc\\)$" . -1))
+  '(("^[-_+]?a\\(lpha\\)?$"   . -3)
+    ("^[-_+]$" . -3)	; treat "1.2.3-20050920" and "1.2-3" as alpha releases
+    ("^[-_+]cvs$" . -3)	; treat "1.2.3-CVS" as alpha release
+    ("^[-_+]?b\\(eta\\)?$"    . -2)
+    ("^[-_+]?\\(pre\\|rc\\)$" . -1))
   "*Specify association between non-numeric version part and a priority.
 
 This association is used to handle version string like \"1.0pre2\",
@@ -2887,6 +2889,9 @@
 Where:
 
 REGEXP		regexp used to match non-numeric part of a version string.
+		It should begin with a `^' anchor and end with a `$' to
+		prevent false hits.  Letter-case is ignored while matching
+		REGEXP.
 
 PRIORITY	negative integer which indicate the non-numeric priority.")
 
@@ -2903,9 +2908,12 @@
    SEPARATOR ::= `version-separator' (which see)
 	       | `version-regexp-alist' (which see).
 
+The NUMBER part is optional if SEPARATOR is a match for an element
+in `version-regexp-alist'.
+
 As an example of valid version syntax:
 
-   1.0pre2   1.0.7.5   22.8beta3   0.9alpha1
+   1.0pre2   1.0.7.5   22.8beta3   0.9alpha1   6.9.30Beta
 
 As an example of invalid version syntax:
 
@@ -2928,7 +2936,7 @@
       (error "Invalid version string: '%s'" ver))
   (save-match-data
     (let ((i 0)
-	  case-fold-search		; ignore case in matching
+	  (case-fold-search t)		; ignore case in matching
 	  lst s al)
       (while (and (setq s (string-match "[0-9]+" ver i))
 		  (= s i))