mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-85

Browse source 
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
This commit is contained in:
Miles Bader 2005-09-25 22:07:01 +00:00
commit 7b9dc9afcc
143 changed files with 3059 additions and 1991 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lisp/subr.el
View file

@ -2862,9 +2862,11 @@ Usually the separator is \".\", but it can be any other string.")
(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 @@ Each element has the following form:
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 @@ The version syntax is given by the following EBNF:
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 @@ See documentation for `version-separator' and `version-regexp-alist'."
(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))