aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBozhidar Batsov2013-11-14 19:07:03 +0200
committerBozhidar Batsov2013-11-14 19:07:03 +0200
commit0d5363c4cdc0de80137744f2c2445606042cf2cd (patch)
tree9e973ea803d7ab075cfa7a91017b952932c7bd65
parent99f5d0744ebf302d9ba56aae78da90504cb48772 (diff)
downloademacs-0d5363c4cdc0de80137744f2c2445606042cf2cd.tar.gz
emacs-0d5363c4cdc0de80137744f2c2445606042cf2cd.zip
* lisp/subr.el (version-regexp-alist):
Recognize hg, svn and darcs versions as snapshot versions.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/subr.el14
2 files changed, 11 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c9d767e5b7d..1177d14a6e9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12013-11-14 Bozhidar Batsov <bozhidar@batsov.com> 12013-11-14 Bozhidar Batsov <bozhidar@batsov.com>
2 2
3 * subr.el (version-regexp-alist):
4 Recognize hg, svn and darcs versions as snapshot versions.
5
3 * progmodes/ruby-mode.el (ruby-mode-set-encoding): 6 * progmodes/ruby-mode.el (ruby-mode-set-encoding):
4 Add the ability to always insert an utf-8 encoding comment. 7 Add the ability to always insert an utf-8 encoding comment.
5 Fix and simplify coding comment update logic. 8 Fix and simplify coding comment update logic.
diff --git a/lisp/subr.el b/lisp/subr.el
index e8d3245ff10..612638fcf20 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -4470,12 +4470,14 @@ Usually the separator is \".\", but it can be any other string.")
4470 4470
4471 4471
4472(defconst version-regexp-alist 4472(defconst version-regexp-alist
4473 '(("^[-_+ ]?snapshot$" . -4) 4473 '(("^[-_+ ]?snapshot$" . -4)
4474 ("^[-_+]$" . -4) ; treat "1.2.3-20050920" and "1.2-3" as snapshot releases 4474 ;; treat "1.2.3-20050920" and "1.2-3" as snapshot releases
4475 ("^[-_+ ]?\\(cvs\\|git\\|bzr\\)$" . -4) ; treat "1.2.3-CVS" as snapshot release 4475 ("^[-_+]$" . -4)
4476 ("^[-_+ ]?alpha$" . -3) 4476 ;; treat "1.2.3-CVS" as snapshot release
4477 ("^[-_+ ]?beta$" . -2) 4477 ("^[-_+ ]?\\(cvs\\|git\\|bzr\\|svn\\|hg\\|darcs\\)$" . -4)
4478 ("^[-_+ ]?\\(pre\\|rcc\\)$" . -1)) 4478 ("^[-_+ ]?alpha$" . -3)
4479 ("^[-_+ ]?beta$" . -2)
4480 ("^[-_+ ]?\\(pre\\|rcc\\)$" . -1))
4479 "Specify association between non-numeric version and its priority. 4481 "Specify association between non-numeric version and its priority.
4480 4482
4481This association is used to handle version string like \"1.0pre2\", 4483This association is used to handle version string like \"1.0pre2\",