diff options
| -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 @@ | |||
| 1 | 2011-07-14 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * subr.el (version<, version<=, version=): Mention "-CVS" and | ||
| 4 | "-12345" alpha version numbers. | ||
| 5 | |||
| 1 | 2011-07-14 Chong Yidong <cyd@stupidchicken.com> | 6 | 2011-07-14 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 7 | ||
| 3 | * bindings.el: Add advertised binding for set-mark-command | 8 | * 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." | |||
| 4087 | Note that version string \"1\" is equal to \"1.0\", \"1.0.0\", \"1.0.0.0\", | 4087 | Note that version string \"1\" is equal to \"1.0\", \"1.0.0\", \"1.0.0.0\", |
| 4088 | etc. That is, the trailing \".0\"s are insignificant. Also, version | 4088 | etc. That is, the trailing \".0\"s are insignificant. Also, version |
| 4089 | string \"1\" is higher (newer) than \"1pre\", which is higher than \"1beta\", | 4089 | string \"1\" is higher (newer) than \"1pre\", which is higher than \"1beta\", |
| 4090 | which is higher than \"1alpha\"." | 4090 | which is higher than \"1alpha\". Also, \"-CVS\" and \"-NNN\" are treated |
| 4091 | as alpha versions." | ||
| 4091 | (version-list-< (version-to-list v1) (version-to-list v2))) | 4092 | (version-list-< (version-to-list v1) (version-to-list v2))) |
| 4092 | 4093 | ||
| 4093 | 4094 | ||
| @@ -4097,7 +4098,8 @@ which is higher than \"1alpha\"." | |||
| 4097 | Note that version string \"1\" is equal to \"1.0\", \"1.0.0\", \"1.0.0.0\", | 4098 | Note that version string \"1\" is equal to \"1.0\", \"1.0.0\", \"1.0.0.0\", |
| 4098 | etc. That is, the trailing \".0\"s are insignificant. Also, version | 4099 | etc. That is, the trailing \".0\"s are insignificant. Also, version |
| 4099 | string \"1\" is higher (newer) than \"1pre\", which is higher than \"1beta\", | 4100 | string \"1\" is higher (newer) than \"1pre\", which is higher than \"1beta\", |
| 4100 | which is higher than \"1alpha\"." | 4101 | which is higher than \"1alpha\". Also, \"-CVS\" and \"-NNN\" are treated |
| 4102 | as alpha versions." | ||
| 4101 | (version-list-<= (version-to-list v1) (version-to-list v2))) | 4103 | (version-list-<= (version-to-list v1) (version-to-list v2))) |
| 4102 | 4104 | ||
| 4103 | (defun version= (v1 v2) | 4105 | (defun version= (v1 v2) |
| @@ -4106,7 +4108,8 @@ which is higher than \"1alpha\"." | |||
| 4106 | Note that version string \"1\" is equal to \"1.0\", \"1.0.0\", \"1.0.0.0\", | 4108 | Note that version string \"1\" is equal to \"1.0\", \"1.0.0\", \"1.0.0.0\", |
| 4107 | etc. That is, the trailing \".0\"s are insignificant. Also, version | 4109 | etc. That is, the trailing \".0\"s are insignificant. Also, version |
| 4108 | string \"1\" is higher (newer) than \"1pre\", which is higher than \"1beta\", | 4110 | string \"1\" is higher (newer) than \"1pre\", which is higher than \"1beta\", |
| 4109 | which is higher than \"1alpha\"." | 4111 | which is higher than \"1alpha\". Also, \"-CVS\" and \"-NNN\" are treated |
| 4112 | as alpha versions." | ||
| 4110 | (version-list-= (version-to-list v1) (version-to-list v2))) | 4113 | (version-list-= (version-to-list v1) (version-to-list v2))) |
| 4111 | 4114 | ||
| 4112 | 4115 | ||