ChangeLog fixes

lisp/ChangeLog

@@ -140,12 +140,12 @@
 
 2014-08-13  Eric S. Raymond  <esr@thyrsus.com>
 
-	* vc/vc.git.el (vc-git-resolve-when-done): New function.
+	* vc/vc-git.el (vc-git-resolve-when-done): New function.
 	Call "git add" when there are no longer conflict markers.
 
 2014-08-13  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 
-	* vc/vc.git.el (vc-git-find-file-hook): New function.
+	* vc/vc-git.el (vc-git-find-file-hook): New function.
 	Adds support for calling smerge (and resolve) on a conflicted file.
 	(vc-git-conflicted-files): New function.
 	Useful in itself and a step towards better smerge support.
@@ -281,24 +281,13 @@
 
 2014-08-07  Eli Zaretskii  <eliz@gnu.org>
 
-	* files.el (auto-mode-alist): Remove support for VMS from a
-	pattern.
+	* files.el (auto-mode-alist): Remove support for VMS from a pattern.
 
 2014-08-07  Reuben Thomas  <rrt@sc3d.org>
 
 	Refer to MS-DOS using the same name everywhere.
-
-	* arc-mode.el: Fix a couple of ``MS-DOG''s missed in the previous
-	commit.
-	* file-mode.el: ditto.
-
-2014-08-07  Reuben Thomas  <rrt@sc3d.org>
-
-	Refer to MS-DOS using the same name everywhere.
-
-	* arc-mode.el: ``MS-DOG'', ``MSDOG'' and ``msdog'' become
-	``MS-DOS''.
-	* frame.el: ditto.
+	* arc-mode.el, files.el, frame.el: ``MS-DOG'', ``MSDOG'' and
+	``msdog'' become ``MS-DOS''.
 
 2014-08-07  Michael Albinus  <michael.albinus@gmx.de>
 
@@ -3958,9 +3947,7 @@
 2014-03-23  Daniel Colascione  <dancol@dancol.org>
 
 	Change subword-mode to use `find-word-boundary-function-table' and
-	replace `capitalized-words-mode'.  Also, convert to lexical
-	binding.
-
+	replace `capitalized-words-mode'.  Also, convert to lexical binding.
 	* progmodes/cap-words.el: Delete now-obsolete file.
 	* progmodes/subword.el: Reimplement using
 	`find-word-boundary-function-table'.

msdos/ChangeLog

@@ -4,11 +4,12 @@
 
 2014-08-09  Reuben Thomas  <rrt@sc3d.org>
 
+	* is_exec.c, sigaction.c: Remove files.
 	* sed2v2.inp: Remove support for DJGPP 2.01.
 	* INSTALL: Don't mention removed files msdos/is_exec.c and
 	sigaction.c, and increase minimum version of DJGPP to 2.02.
 	* README: Remove note on legal status of removed files
-	msdos/is_exec.c and sigaction.c.
+	is_exec.c and sigaction.c.
 
 2014-04-16  Eli Zaretskii  <eliz@gnu.org>
 

nt/ChangeLog

@@ -18,8 +18,7 @@
 
 	* Makefile.in (DONT_INSTALL): Now empty.
 	(addsection${EXEEXT}): Remove target.
-
-	* addsection.c: File removed.
+	* addsection.c: Remove file.
 
 2014-05-27  Fabrice Popineau  <fabrice.popineau@gmail.com>
 

src/ChangeLog

@@ -43,7 +43,7 @@
 	One more minor cleanup of font subsystem.
 	* font.h (struct font_driver): Convert text_extents to
 	return void because returned value is never actually used.
-	* macfont.c (macfont_text_extents):
+	* macfont.m (macfont_text_extents):
 	* w32font.c (w32font_text_extents):
 	* xftfont.c (xftfont_text_extents): Adjust to return void
 	and assume that 'metrics' argument is always non-NULL.
@@ -206,9 +206,10 @@
 2014-08-09  Reuben Thomas  <rrt@sc3d.org>
 
 	* alloc.c (Fmemory_info): Remove a stray brace.
+
 	* process.c: Fix a comment typo.
-	* msdos.c:
-	* dosfns.c (init_dosfns): Remove support for DJGPP < 2.02.
+
+	* msdos.c, dosfns.c (init_dosfns): Remove support for DJGPP < 2.02.
 
 2014-08-09  Jan Djärv  <jan.h.d@swipnet.se>