ChangeLog merge fixes

2f4cadd1 · Glenn Morris · d3722480 · 2f4cadd1 · 2f4cadd1
Commit 2f4cadd1 authored May 14, 2012 by Glenn Morris
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 7 deletions

doc/misc/ChangeLog doc/misc/ChangeLog +1 -1

lisp/ChangeLog lisp/ChangeLog +0 -6

No files found.
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
-2012-05-12  Andreas Schwab  <schwab@linux-m68k.org>
+2012-05-14  Andreas Schwab  <schwab@linux-m68k.org>

 	* cc-mode.texi: Avoid space before macro in 4th argument of cross
 	reference commands.  (Bug#11461)

--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
-2012-05-14  Troels Nielsen  <bn.troels@gmail.com>  (tiny change)
-
-	* progmodes/compile.el (compilation-internal-error-properties):
-	Calculate start position correctly when end-col is set but
-	end-line is not (Bug#11382).
-
 2012-05-14  Stefan Monnier  <monnier@iro.umontreal.ca>

 	* net/rlogin.el (rlogin-mode-map): Fix last change.