diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2011-07-14 02:50:21 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2011-07-14 02:50:21 -0400 |
| commit | 7e5bfb8fec244ab07253d1dd95fcef0673b89cbc (patch) | |
| tree | 48fcbf1e7519195e9eaa6bda0ea2f1bf03b16af9 | |
| parent | 27fa387ad10e6a5639de1ab08e7559c06e9d802d (diff) | |
| download | emacs-7e5bfb8fec244ab07253d1dd95fcef0673b89cbc.tar.gz | |
lisp/subr.el (version-*): Doc fix.
lisp/subr.el (version<, version<=, version=): Mention "-CVS" and
"-12345" alpha version numbers.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/subr.el | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6d652931328..7f86e6ef53f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-07-14 Eli Zaretskii <eliz@gnu.org> + + * subr.el (version<, version<=, version=): Mention "-CVS" and + "-12345" alpha version numbers. + 2011-07-14 Chong Yidong <cyd@stupidchicken.com> * bindings.el: Add advertised binding for set-mark-command diff --git a/lisp/subr.el b/lisp/subr.el index 5c890eefa29..94b28c007d1 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -4087,7 +4087,8 @@ If all LST elements are zeros or LST is nil, return zero." Note that version string \"1\" is equal to \"1.0\", \"1.0.0\", \"1.0.0.0\", etc. That is, the trailing \".0\"s are insignificant. Also, version string \"1\" is higher (newer) than \"1pre\", which is higher than \"1beta\", -which is higher than \"1alpha\"." +which is higher than \"1alpha\". Also, \"-CVS\" and \"-NNN\" are treated +as alpha versions." (version-list-< (version-to-list v1) (version-to-list v2))) @@ -4097,7 +4098,8 @@ which is higher than \"1alpha\"." Note that version string \"1\" is equal to \"1.0\", \"1.0.0\", \"1.0.0.0\", etc. That is, the trailing \".0\"s are insignificant. Also, version string \"1\" is higher (newer) than \"1pre\", which is higher than \"1beta\", -which is higher than \"1alpha\"." +which is higher than \"1alpha\". Also, \"-CVS\" and \"-NNN\" are treated +as alpha versions." (version-list-<= (version-to-list v1) (version-to-list v2))) (defun version= (v1 v2) @@ -4106,7 +4108,8 @@ which is higher than \"1alpha\"." Note that version string \"1\" is equal to \"1.0\", \"1.0.0\", \"1.0.0.0\", etc. That is, the trailing \".0\"s are insignificant. Also, version string \"1\" is higher (newer) than \"1pre\", which is higher than \"1beta\", -which is higher than \"1alpha\"." +which is higher than \"1alpha\". Also, \"-CVS\" and \"-NNN\" are treated +as alpha versions." (version-list-= (version-to-list v1) (version-to-list v2))) |