summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/version.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 19b2e5514f0..e139b713d64 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-26 Eric S. Raymond <esr@thyrsus.com>
+
+ * version.el: Fix some fallback values to conform to the actual
+ release number.
+
2014-10-25 Eric S. Raymond <esr@thyrsus.com>
* Makefile.in: Change some production names so they're neutral
diff --git a/lisp/version.el b/lisp/version.el
index 68b502ce451..c3a36ecc21e 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 "24.4")
+ 'emacs-repository-version "25.1")
(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 "24.4")
+ 'emacs-repository-get-version "25.1")
(defun emacs-repository-get-version (&optional dir external)
"Try to return as a string the repository revision of the Emacs sources.