[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/subr.el
From: |
Kim F. Storm |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/subr.el |
Date: |
Mon, 12 Dec 2005 14:23:06 +0000 |
Index: emacs/lisp/subr.el
diff -u emacs/lisp/subr.el:1.487 emacs/lisp/subr.el:1.488
--- emacs/lisp/subr.el:1.487 Sat Dec 3 02:30:48 2005
+++ emacs/lisp/subr.el Mon Dec 12 14:23:06 2005
@@ -2895,11 +2895,11 @@
(defvar version-regexp-alist
- '(("^[-_+]?a\\(lpha\\)?$" . -3)
+ '(("^[-_+ ]?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))
+ ("^[-_+ ]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\",
@@ -2910,10 +2910,10 @@
\"1.0pre2\" (1 0 -1 2)
\"1.0PRE2\" (1 0 -1 2)
\"22.8beta3\" (22 8 -2 3)
- \"22.8Beta3\" (22 8 -2 3)
+ \"22.8 Beta3\" (22 8 -2 3)
\"0.9alpha1\" (0 9 -3 1)
\"0.9AlphA1\" (0 9 -3 1)
- \"0.9alpha\" (0 9 -3)
+ \"0.9 alpha\" (0 9 -3)
Each element has the following form:
@@ -2965,8 +2965,13 @@
\"0.9alpha\" (0 9 -3)
See documentation for `version-separator' and `version-regexp-alist'."
- (or (and (stringp ver) (not (string= ver "")))
+ (or (and (stringp ver) (> (length ver) 0))
(error "Invalid version string: '%s'" ver))
+ ;; Change .x.y to 0.x.y
+ (if (and (>= (length ver) (length version-separator))
+ (string-equal (substring ver 0 (length version-separator))
+ version-separator))
+ (setq ver (concat "0" ver)))
(save-match-data
(let ((i 0)
(case-fold-search t) ; ignore case in matching
- [Emacs-diffs] Changes to emacs/lisp/subr.el, John Paul Wallington, 2005/12/02
- [Emacs-diffs] Changes to emacs/lisp/subr.el,
Kim F. Storm <=
- [Emacs-diffs] Changes to emacs/lisp/subr.el, Stefan Monnier, 2005/12/18
- [Emacs-diffs] Changes to emacs/lisp/subr.el, Stefan Monnier, 2005/12/26
- [Emacs-diffs] Changes to emacs/lisp/subr.el, Luc Teirlinck, 2005/12/28
- [Emacs-diffs] Changes to emacs/lisp/subr.el, Luc Teirlinck, 2005/12/29
- [Emacs-diffs] Changes to emacs/lisp/subr.el, Juri Linkov, 2005/12/30