diff options
| author | Glenn Morris | 2014-10-31 11:09:24 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2014-10-31 11:09:24 +0200 |
| commit | 15d0d8d11bb015f76e83f8d43da7622eff12ff95 (patch) | |
| tree | e8c3a2939a82caa84eb50cced0745659cd57c23b | |
| parent | 1ad9ad3bfe59e781ab7dd4b340c1dad9ef94d9ae (diff) | |
| download | emacs-15d0d8d11bb015f76e83f8d43da7622eff12ff95.tar.gz emacs-15d0d8d11bb015f76e83f8d43da7622eff12ff95.zip | |
Yet another change for git migration backported from trunk.
lisp/version.el (emacs-bzr-version, emacs-bzr-get-version):
Revert 2014-10-31 change.
| -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 daba07c3c9e..dc5fae78970 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-10-31 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * version.el (emacs-bzr-version, emacs-bzr-get-version): | ||
| 4 | Revert 2014-10-31 change. | ||
| 5 | |||
| 1 | 2014-10-31 Eric S. Raymond <esr@thyrsus.com> | 6 | 2014-10-31 Eric S. Raymond <esr@thyrsus.com> |
| 2 | 7 | ||
| 3 | * version.el: Fix some fallback values to conform to the actual | 8 | * version.el: Fix some fallback values to conform to the actual |
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, | |||
| 91 | or if we could not determine the revision.") | 91 | or if we could not determine the revision.") |
| 92 | 92 | ||
| 93 | (define-obsolete-variable-alias 'emacs-bzr-version | 93 | (define-obsolete-variable-alias 'emacs-bzr-version |
| 94 | 'emacs-repository-version "25.1") | 94 | 'emacs-repository-version "24.4") |
| 95 | 95 | ||
| 96 | (defun emacs-bzr-version-dirstate (dir) | 96 | (defun emacs-bzr-version-dirstate (dir) |
| 97 | "Try to return as a string the bzr revision ID of directory DIR. | 97 | "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." | |||
| 129 | (buffer-string)))) | 129 | (buffer-string)))) |
| 130 | 130 | ||
| 131 | (define-obsolete-function-alias 'emacs-bzr-get-version | 131 | (define-obsolete-function-alias 'emacs-bzr-get-version |
| 132 | 'emacs-repository-get-version "25.1") | 132 | 'emacs-repository-get-version "24.4") |
| 133 | 133 | ||
| 134 | (defun emacs-repository-get-version (&optional dir external) | 134 | (defun emacs-repository-get-version (&optional dir external) |
| 135 | "Try to return as a string the repository revision of the Emacs sources. | 135 | "Try to return as a string the repository revision of the Emacs sources. |