[Emacs-diffs] trunk r116115: ChangeLog fix.

[Glenn Morris]

------------------------------------------------------------
revno: 116115
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2014-01-22 14:26:45 -0500
message:
  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...
modified:
  etc/NEWS                       news-20100311060928-aoit31wvzf25yr1z-1
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2014-01-22 17:26:14 +0000
+++ b/etc/NEWS  2014-01-22 19:26:45 +0000
@@ -236,7 +236,8 @@
 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:
 

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-01-22 19:22:45 +0000
+++ b/lisp/ChangeLog    2014-01-22 19:26:45 +0000
@@ -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  <address@hidden>
+2014-01-11  Dani Moncayo  <address@hidden>
+           Eric S. Raymond  <address@hidden>
 
        * 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  <address@hidden>
+
        * play/meese.el: It's 2014 and Ed Meese is justly forgotten.
        Goes with removal of the joke manpages from /etc.