Commit 15d0d8d1 authored by Glenn Morris's avatar Glenn Morris Committed by Eli Zaretskii
Browse files

Yet another change for git migration backported from trunk.

 lisp/version.el (emacs-bzr-version, emacs-bzr-get-version):
 Revert 2014-10-31 change.
parent 1ad9ad3b
2014-10-31 Glenn Morris <rgm@gnu.org>
* version.el (emacs-bzr-version, emacs-bzr-get-version):
Revert 2014-10-31 change.
2014-10-31 Eric S. Raymond <esr@thyrsus.com> 2014-10-31 Eric S. Raymond <esr@thyrsus.com>
   
* version.el: Fix some fallback values to conform to the actual * version.el: Fix some fallback values to conform to the actual
......
...@@ -91,7 +91,7 @@ Value is nil if Emacs was not built from a repository checkout, ...@@ -91,7 +91,7 @@ Value is nil if Emacs was not built from a repository checkout,
or if we could not determine the revision.") or if we could not determine the revision.")
(define-obsolete-variable-alias 'emacs-bzr-version (define-obsolete-variable-alias 'emacs-bzr-version
'emacs-repository-version "25.1") 'emacs-repository-version "24.4")
(defun emacs-bzr-version-dirstate (dir) (defun emacs-bzr-version-dirstate (dir)
"Try to return as a string the bzr revision ID of directory 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." ...@@ -129,7 +129,7 @@ Returns nil if unable to find this information."
(buffer-string)))) (buffer-string))))
(define-obsolete-function-alias 'emacs-bzr-get-version (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) (defun emacs-repository-get-version (&optional dir external)
"Try to return as a string the repository revision of the Emacs sources. "Try to return as a string the repository revision of the Emacs sources.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment