Fixes for emacs-repository-get-version

[bpt/emacs.git] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2566cf3..1d957de 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,29 @@
 2014-01-22  Glenn Morris  <rgm@gnu.org>
 
-       * emacs-lisp/authors.el (authors-valid-file-names): Additions.
+       * 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.
+       * window.el (window-total-size, window-size): New argument
+       ROUND.
+       (window--min-delta-1, window-min-delta, window--max-delta-1): Be
+       more conservative when calculating the numbers of lines or
+       columns a window can shrink (Bug#16430).
+       (fit-window-to-buffer): Simplify code.
+       * term.el (term-window-width): Call window-body-width again.
+
+2014-01-22  Glenn Morris  <rgm@gnu.org>
+
+       * image.el (image-format-suffixes): Doc fix.
+
+       * international/quail.el (quail-define-package): Doc fix.
+
+       * emacs-lisp/authors.el (authors-valid-file-names):
+       (authors-renamed-files-alist): Additions.
 
        * vc/vc-git.el (vc-git-print-log): Remove --follow;
        reverts 2014-01-09 change.  (Bug#16422)