diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/subr.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 322934fac8c..a8e807adc1c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-11-15 Bozhidar Batsov <bozhidar@batsov.com> | ||
| 2 | |||
| 3 | * subr.el (version-regexp-alist): Fix a typo. | ||
| 4 | |||
| 1 | 2013-11-15 Michael Albinus <michael.albinus@gmx.de> | 5 | 2013-11-15 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 6 | ||
| 3 | * net/tramp-sh.el (tramp-remote-process-environment): Set "LC_ALL" to | 7 | * net/tramp-sh.el (tramp-remote-process-environment): Set "LC_ALL" to |
diff --git a/lisp/subr.el b/lisp/subr.el index 612638fcf20..31798b44849 100644 --- a/lisp/subr.el +++ b/lisp/subr.el | |||
| @@ -4477,7 +4477,7 @@ Usually the separator is \".\", but it can be any other string.") | |||
| 4477 | ("^[-_+ ]?\\(cvs\\|git\\|bzr\\|svn\\|hg\\|darcs\\)$" . -4) | 4477 | ("^[-_+ ]?\\(cvs\\|git\\|bzr\\|svn\\|hg\\|darcs\\)$" . -4) |
| 4478 | ("^[-_+ ]?alpha$" . -3) | 4478 | ("^[-_+ ]?alpha$" . -3) |
| 4479 | ("^[-_+ ]?beta$" . -2) | 4479 | ("^[-_+ ]?beta$" . -2) |
| 4480 | ("^[-_+ ]?\\(pre\\|rcc\\)$" . -1)) | 4480 | ("^[-_+ ]?\\(pre\\|rc\\)$" . -1)) |
| 4481 | "Specify association between non-numeric version and its priority. | 4481 | "Specify association between non-numeric version and its priority. |
| 4482 | 4482 | ||
| 4483 | This association is used to handle version string like \"1.0pre2\", | 4483 | This association is used to handle version string like \"1.0pre2\", |