[Emacs-diffs] Changes to emacs/lisp/subr.el

[Eli Zaretskii]

Index: emacs/lisp/subr.el
diff -c emacs/lisp/subr.el:1.478 emacs/lisp/subr.el:1.479
*** emacs/lisp/subr.el:1.478    Fri Aug 26 12:31:55 2005
--- emacs/lisp/subr.el  Sat Sep 24 10:40:13 2005
***************
*** 2862,2870 ****
  
  
  (defvar version-regexp-alist
!   '(("^a\\(lpha\\)?$"   . -3)
!     ("^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\",
--- 2862,2872 ----
  
  
  (defvar version-regexp-alist
!   '(("^[-_+]?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,2892 ****
--- 2889,2897 ----
  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,2911 ****
     SEPARATOR ::= `version-separator' (which see)
               | `version-regexp-alist' (which see).
  
  As an example of valid version syntax:
  
!    1.0pre2   1.0.7.5   22.8beta3   0.9alpha1
  
  As an example of invalid version syntax:
  
--- 2908,2919 ----
     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   6.9.30Beta
  
  As an example of invalid version syntax:
  
***************
*** 2928,2934 ****
        (error "Invalid version string: '%s'" ver))
    (save-match-data
      (let ((i 0)
!         case-fold-search              ; ignore case in matching
          lst s al)
        (while (and (setq s (string-match "[0-9]+" ver i))
                  (= s i))
--- 2936,2942 ----
        (error "Invalid version string: '%s'" ver))
    (save-match-data
      (let ((i 0)
!         (case-fold-search t)          ; ignore case in matching
          lst s al)
        (while (and (setq s (string-match "[0-9]+" ver i))
                  (= s i))