ChangeLog fix.

* lisp/ChangeLog: The installed change was based on this one:
http://lists.gnu.org/archive/html/emacs-devel/2013-10/msg00372.html

* etc/NEWS: Fix based on the fact that this does not work out of the box,
unless you fetch the notes, as described in
  http://lists.gnu.org/archive/html/emacs-devel/2013-10/msg00015.html
Seems very non-intuitive to me...

diff --git a/etc/NEWS b/etc/NEWS
index 2e49a8fb4985b56c311b6e57f4fb95b6816149f4..144f5587c751cd255818e1606f9119ca6d0eabc6 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -236,7 +236,8 @@ simply disabling Transient Mark mode does the same thing.
 and this variable has been marked obsolete.
 
 ---
-** `emacs-bzr-version' has been renamed to `emacs-repository-version'.
+** `emacs-bzr-version' has been renamed to `emacs-repository-version',
+and works for git too, if you fetch the repository notes.
 
 ** New user options:
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dc93d5c3cfe75d29e8e401c1f478566f98d82a8c..99b65d735eb635fcbdee3012fba6aee1b5cab594 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -336,11 +336,14 @@
        * simple.el (read--expression): Enable eldoc-mode.
        * progmodes/octave.el (octave-mode-menu): Adapt to change in eldoc.
 
-2014-01-11  Eric S. Raymond  <esr@thyrsus.com>
+2014-01-11  Dani Moncayo  <dmoncayo@gmail.com>
+           Eric S. Raymond  <esr@thyrsus.com>
 
        * version.el (emacs-repository-get-version): Enhance so the
        function works correctly in either a Bazaar or Git repo.
 
+2014-01-11  Eric S. Raymond  <esr@thyrsus.com>
+
        * play/meese.el: It's 2014 and Ed Meese is justly forgotten.
        Goes with removal of the joke manpages from /etc.