summaryrefslogtreecommitdiff
path: root/lisp/version.el
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2014-10-31 11:06:47 +0200
committerEli Zaretskii <eliz@gnu.org>2014-10-31 11:06:47 +0200
commit1ad9ad3bfe59e781ab7dd4b340c1dad9ef94d9ae (patch)
tree3c8153c9ff4cc9471adf1a5bcc4632c7f1f14f97 /lisp/version.el
parentcac77f92e3861e81d5fe96b4b857fd9d243032e2 (diff)
downloademacs-1ad9ad3bfe59e781ab7dd4b340c1dad9ef94d9ae.tar.gz
Backport from trunk more changes in preparation for git migration.
admin/notes/bzr: Renamed to notes/repo, reorganixed to separate VCS-dependent from VCS-independent stuff. Added guidance about commit-comment format under DVCSes. admin/notes/BRANCH: Merged into notes/repo. lisp/version.el: Fix some fallback values to conform to the actual release number.
Diffstat (limited to 'lisp/version.el')
-rw-r--r--lisp/version.el4
1 files changed, 2 insertions, 2 deletions
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.