Yet another change for git migration backported from trunk.

 lisp/version.el (emacs-bzr-version, emacs-bzr-get-version):
 Revert 2014-10-31 change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index daba07c3c9ef49e1f82ee6f3edab3c09f257a776..dc5fae7897036c753c8f583ec1178c0db28578f2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+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>
 
        * version.el: Fix some fallback values to conform to the actual

diff --git a/lisp/version.el b/lisp/version.el
index c3a36ecc21ed205da001b651eb1a0b441cc255f8..68b502ce451dc21a9dc66a41472b4f9c84b11ddc 100644 (file)
--- 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.