Fix up merged ChangeLog entries (dates, duplication, etc)

7 files changed, 12 insertions, 45 deletions

diff --git a/ChangeLog b/ChangeLog
index 4ab7aac4bec..498ae90cce6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -73,7 +73,7 @@
 
         * .gitignore: Add entries for emacsvers files.
 
-2014-11-17  Paul Eggert  <eggert@cs.ucla.edu>
+2014-11-27  Paul Eggert  <eggert@cs.ucla.edu>
 
         Restore 'Bug#' -> 'debbugs:' rewrite in log-edit-mode.
         * .dir-locals.el (log-edit-mode): Restore the (log-edit-rewrite-fixes
diff --git a/admin/ChangeLog b/admin/ChangeLog
index d894f768fcd..70961a727a6 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -13,7 +13,7 @@
         * gitmerge.el: New file.
         * notes/git-workflow: Add documentation for using it.
 
-2014-11-17  Oscar Fuentes  <ofv@wanadoo.es>
+2014-11-27  Oscar Fuentes  <ofv@wanadoo.es>
 
         * admin/CPP-DEFINES: Mention MINGW_W64.
 
@@ -22,12 +22,6 @@
         * admin.el (set-version): No more need to update nt/*.rc.
         * authors.el (authors-renamed-files-alist): Add .rc.in files.
 
-2014-11-16  Glenn Morris  <rgm@gnu.org>
-
-        * update_autogen: Auto-detect VCS in use.
-        (vcs): New variable.
-        (status, commit, main): Handle git.
-
 2014-11-13  Andreas Schwab  <schwab@suse.de>
 
         * make-tarball.txt: Make annotated tag and push it out.
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 956f14b0bdb..bc81e177d85 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -10,7 +10,7 @@
         * maintaining.texi (Switching Branches): Mention "C-x v r".
         Correct commands for switching branches in various VCSs.
 
-2014-11-16  Tassilo Horn  <tsdh@gnu.org>
+2014-11-27  Tassilo Horn  <tsdh@gnu.org>
 
         * misc.texi (DocView Slicing): Describe how to slice with the
         mouse.  Fix command mentioned by slice by BoundingBox paragraph.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fbd7e2f8eeb..f1ef3f2a232 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -9,12 +9,6 @@
         forward to find the end of the subtree and the insertion point
         (bug#19102).
 
-2014-11-29  Leonard Randall  <leonard.a.randall@gmail.com>
-
-        * textmodes/reftex-parse.el (reftex-using-biblatex-p): Make search
-        for comment lines non-greedy and stopping at newlines to fix stack
-        overflows with large files. [Backport]
-
 2014-11-29  Fabián Ezequiel Gallina  <fgallina@gnu.org>
 
         * progmodes/python.el (python-shell-completion-setup-code): Use
@@ -171,19 +165,19 @@
 
         * dom.el (dom-pp): New function.
 
-2014-11-17  Eli Zaretskii  <eliz@gnu.org>
+2014-11-27  Eli Zaretskii  <eliz@gnu.org>
 
         * vc/vc-bzr.el (vc-bzr-print-log, vc-bzr-expanded-log-entry):
         Don't assume --long is the default for "bzr log", always specify
         it explicitly, in case the user defined an alias for 'log' that
         uses some other format.
 
-2014-11-16  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+2014-11-27  Fabián Ezequiel Gallina  <fgallina@gnu.org>
 
         * progmodes/python.el (python-eldoc--get-doc-at-point):
         Strip shell output before returning.  (bug#18794)
 
-2014-11-16  Dmitry Gutov  <dgutov@yandex.ru>
+2014-11-27  Dmitry Gutov  <dgutov@yandex.ru>
 
         Fix indentation before `!=' and after `+='.  Originally reported
         in https://github.com/mooz/js2-mode/issues/174.
@@ -191,7 +185,7 @@
         (in)equality operator a separate case.
         (js--continued-expression-p): Escape the second `+' in the regexp.
 
-2014-11-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+2014-11-27  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * window.el (handle-select-window): Deactivate shift-region (bug#19003).
 
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index e2b26684c6d..01754315861 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -28,10 +28,6 @@
         * message.el (message-valid-fqdn-regexp): Add non-internaional new
         TLDs.
 
-2014-11-16  Adam Sjøgren  <asjo@koldfront.dk>
-
-        * mml2015.el (mml2015-display-key-image): New variable.
-
 2014-11-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus-sum.el (gnus-summary-exit-no-update): Don't query about
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 6f905627523..28f5fd432d4 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,12 +1,7 @@
-2014-11-17  Oscar Fuentes  <ofv@wanadoo.es>
+2014-11-27  Oscar Fuentes  <ofv@wanadoo.es>
 
         * inc/ms-w32.h: Define MINGW_W64.
-
-        * nt/addpm.c: Use it.
-
-        * nt/addsection.c: Use it.
-
-        * nt/preprep.c: Use it.
+        * nt/addpm.c, nt/addsection.c, nt/preprep.c: Use it.
 
 2014-11-24  Glenn Morris  <rgm@gnu.org>
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 53834edffa8..668c3e809f6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -25,24 +25,12 @@
         for paxctl and setfattr. Fixes temacs startup failure with
         grsecurity/PaX enabled Linux kernel (bug#19067).
 
-2014-11-29  Ulf Jasper  <ulf.jasper@web.de>
-
-        * nsterm.m (ns_send_appdefined): Check for application defined
-        event on Cocoa (Bug#18993).  Backport from trunk.
-
 2014-11-27  Oscar Fuentes  <ofv@wanadoo.es>
 
-        * src/w32.c: Use MINGW_W64 instead of _W64.
-
-        * src/w32heap.c: Likewise.
-
-2014-11-17  Oscar Fuentes  <ofv@wanadoo.es>
-
-        * src/w32.c: Use MINGW_W64 instead of _W64.
-
-        * src/w32term.c: Likewise.
+        * src/w32.c, src/w32heap.c, src/w32term.c:
+        Use MINGW_W64 instead of _W64.
 
-2014-11-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+2014-11-27  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * frame.c (Fhandle_switch_frame): Deactivate shift-region (bug#19003).