; ChangeLog fixes

1 files changed, 4 insertions, 82 deletions

diff --git a/ChangeLog.2 b/ChangeLog.2
index 4b266e1e952..3b22d482963 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -5982,10 +5982,6 @@
 	* lisp/progmodes/cc-engine.el (c-record-parse-state-state): Terminate stale
 	markers.
 
-2016-03-30  Alan Mackenzie  <acm@muc.de>
-
-	Merge branch 'emacs-25' of /home/acm/emacs/emacs.git/emacs-25 into emacs-25
-
 2016-03-29  Xue Fuqiao  <xfq.free@gmail.com>
 
 	* doc/lispref/text.texi (Columns): Remove a nonexistent reference.
@@ -7281,10 +7277,6 @@
 
 2016-02-28  Michael Albinus  <michael.albinus@gmx.de>
 
-	Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
-
-2016-02-28  Michael Albinus  <michael.albinus@gmx.de>
-
 	Set auto-revert-use-notify to nil in global-auto-revert-mode.  (Bug#22814)
 
 	* etc/NEWS:
@@ -8740,10 +8732,6 @@
 	that we get case-insensitive completion.
 	(erc-completion-at-point): Remove.
 
-2016-02-05  Eli Zaretskii  <eliz@gnu.org>
-
-	Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
-
 2016-02-05  Michael Albinus  <michael.albinus@gmx.de>
 
 	* test/automated/file-notify-tests.el (file-notify-test06-many-events):
@@ -10159,18 +10147,10 @@
 	alternative, such as "This allow you to do something", "This allows
 	something to be done" or "This allows the doing of something".
 
-2016-01-24  l3thal  <kwhite@gnu.org>
-
-	Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
-
 2016-01-24  Kelvin White  <kwhite@gnu.org>
 
 	Add NEWS entry for asynchronous reconnect in ERC
 
-2016-01-24  l3thal  <kwhite@gnu.org>
-
-	Add NEWS entry for asynchronous reconnect in ERC
-
 2016-01-24  Kelvin White  <kwhite@gnu.org>
 
 	browse-url.el: Add 'google-chrome' to supported browsers.
@@ -11065,10 +11045,6 @@
 
 2016-01-15  Phillip Lord  <phillip.lord@russet.org.uk>
 
-	Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
-
-2016-01-15  Phillip Lord  <phillip.lord@russet.org.uk>
-
 	Enable test selector from command line
 
 	* test/automated/Makefile.in: Change variable manipulation to avoid
@@ -11907,10 +11883,6 @@
 
 2016-01-04  Michael Albinus  <michael.albinus@gmx.de>
 
-	Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
-
-2016-01-04  Michael Albinus  <michael.albinus@gmx.de>
-
 	Introduce check-expensive tests.
 
 	* Makefile.in (check-expensive):
@@ -13594,10 +13566,6 @@
 
 	* etc/tutorials/TUTORIAL.pt_BR: Fix a typo.  (Bug#22165)
 
-2015-12-13  Eli Zaretskii  <eliz@gnu.org>
-
-	Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
-
 2015-12-13  Tassilo Horn  <tsdh@gnu.org>
 
 	Improve regex to not trigger stack overflow
@@ -14202,7 +14170,7 @@
 	(ifconfig-program-options): Check the actual program in use.
 	(arp-program): Check sbin directories.
 
-2015-12-04  (tiny change) Arash Esbati  <esbati@gmx.de>  (tiny change)
+2015-12-04  Arash Esbati  <esbati@gmx.de>  (tiny change)
 
 	Fix wrong-type-argument integer-or-marker-p nil error
 
@@ -14211,12 +14179,6 @@
 
 2015-12-04  Alan Mackenzie  <acm@muc.de>
 
-	Merge branch 'scratch/follow' of /home/acm/emacs/emacs.git/emacs-25 into scratch/follow
-
-	Merge necessitated by a rebase operation.
-
-2015-12-04  Alan Mackenzie  <acm@muc.de>
-
 	lisp/isearch.el: Eliminate macro isearch-call-message, replacing with funcall.
 
 2015-12-04  Alan Mackenzie  <acm@muc.de>
@@ -15012,10 +14974,6 @@
 	(isearch-new-regexp-function): Define variable.
 	(isearch-new-word): Define as an obsolete alias. (Bug#22018)
 
-2015-11-27  Eli Zaretskii  <eliz@gnu.org>
-
-	Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
-
 2015-11-27  Lee Bochicchio  <lboc.home@gmail.com>
 
 	* test/automated/abbrev-tests.el: Define more tests
@@ -15101,10 +15059,6 @@
 
 2015-11-26  Phillip Lord  <phillip.lord@russet.org.uk>
 
-	Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
-
-2015-11-26  Phillip Lord  <phillip.lord@russet.org.uk>
-
 	Fix regression after merge.
 
 	 * src/undo.c (prepare_record): Remove call to run_undoable_change.
@@ -15362,10 +15316,6 @@
 
 2015-11-24  Alan Mackenzie  <acm@muc.de>
 
-	Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
-
-2015-11-24  Alan Mackenzie  <acm@muc.de>
-
 	Squashed commit of the following:
 
 	commit e1ecf76585bef2eb87995f7a7f92cc12003a6f70
@@ -15540,10 +15490,6 @@
 	(module_copy_string_contents): Encode before reading the byte
 	size.  Return false if and only if an error occurred.
 
-2015-11-23  Eli Zaretskii  <eliz@gnu.org>
-
-	Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
-
 2015-11-23  Shakthi Kannan  <shakthimaan@gmail.com>
 
 	Add the tamil-dvorak input method
@@ -16721,10 +16667,6 @@
 
 2015-11-14  Dmitry Gutov  <dgutov@yandex.ru>
 
-	Merge branch 'master' into emacs-25
-
-2015-11-14  Dmitry Gutov  <dgutov@yandex.ru>
-
 	Use generic dispatch for xref backends
 
 	* lisp/progmodes/xref.el (xref-backend-functions):
@@ -16814,15 +16756,9 @@
 	(xref-query-replace): Ditto.  And check that the search results
 	are up-to-date.
 
-2015-11-13  John Wiegley  <johnw@newartisans.com>
-
-	Merge remote-tracking branch 'origin/master' into emacs-25
+2015-11-13  Kelvin White  <kwhite@gnu.org>
 
-2015-11-13  l3thal  <kwhite@gnu.org>
-
-	Merge branch 'erc-async-reconnect' into emacs-25
-
-	Reconnect asynchronously.
+	Reconnect asynchronously in erc.
 
 2015-11-13  Paul Eggert  <eggert@cs.ucla.edu>
 
@@ -16843,10 +16779,6 @@
 	mflt_run to leave the output areas unchanged on failure, as
 	this isn’t part of its interface spec.
 
-2015-11-13  Eli Zaretskii  <eliz@gnu.org>
-
-	Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
-
 2015-11-13  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Port recent XCB changes to 64-bit ‘long int’
@@ -31789,7 +31721,7 @@
 	* lisp/emacs-lisp/package.el (package-menu-execute):
 	Remove reference to remove-dups.
 
-2015-05-21  kwhite  <kwhite@gnu.org>
+2015-05-21  Kelvin White  <kwhite@gnu.org>
 
 	* lisp/erc/erc.el: Hide network/channel messages.
 	(erc-network-hide-list, erc-channel-hide-list): New lists to define
@@ -32188,14 +32120,8 @@
 	* lisp/eshell/esh-arg.el (eshell-parse-special-reference): Parse
 	'#<buffer-name>'.
 
-2015-05-17  Jan D  <jan.h.d@swipnet.se>
-
-	Merge branch 'master' into cairo
-
 2015-04-26  Jan D  <jan.h.d@swipnet.se>
 
-	Merge branch 'master' into cairo
-
 	Add PBM support for cairo
 	* src/image.c (xcolor_to_argb32): New function.
 	(get_spec_bg_or_alpha_as_argb): Call xcolor_to_argb32.
@@ -32262,10 +32188,6 @@
 	* src/xterm.c (x_update_begin): Don't create any surface for non-visible
 	tip frames, the geometry may be wrong.
 
-	Merge branch 'master' into cairo, fixes tooltips not shown.
-
-	Merge branch 'master' into cairo
-
 	Add CAIRO_CFLAGS to lwlib/Makefile.in
 	* Makefile.in (CAIRO_CFLAGS): Add.