Fixes for emacs-repository-get-version

[bpt/emacs.git] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d0b8d64..1d957de 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2014-01-22  Glenn Morris  <rgm@gnu.org>
+
+       * version.el (emacs-repository-get-version):
+       Check either .bzr or .git, but not both.
+       Make the git case actually use the DIR argument, and return nil
+       rather than the empty string.
+
 2014-01-22  Martin Rudalics  <rudalics@gmx.at>
 
        Fixes in window size functions around Bug#16430 and Bug#16470.