diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/version.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1ddef8293b7..c0e0c4c1919 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-10-29 Glenn Morris <rgm@gnu.org> + + * version.el (emacs-bzr-version, emacs-bzr-get-version): + Revert 2014-10-26 change. + 2014-10-29 Paul Eggert <eggert@cs.ucla.edu> Simplify use of current-time and friends. diff --git a/lisp/version.el b/lisp/version.el index c3a36ecc21e..68b502ce451 100644 --- a/lisp/version.el +++ b/lisp/version.el @@ -91,7 +91,7 @@ Value is nil if Emacs was not built from a repository checkout, or if we could not determine the revision.") (define-obsolete-variable-alias 'emacs-bzr-version - 'emacs-repository-version "25.1") + 'emacs-repository-version "24.4") (defun emacs-bzr-version-dirstate (dir) "Try to return as a string the bzr revision ID of directory DIR. @@ -129,7 +129,7 @@ Returns nil if unable to find this information." (buffer-string)))) (define-obsolete-function-alias 'emacs-bzr-get-version - 'emacs-repository-get-version "25.1") + 'emacs-repository-get-version "24.4") (defun emacs-repository-get-version (&optional dir external) "Try to return as a string the repository revision of the Emacs sources. |