From 2f4cadd1da7b681171c60fab8499f23f37ce4cb2 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 14 May 2012 09:11:24 -0700 Subject: [PATCH] ChangeLog merge fixes --- doc/misc/ChangeLog | 2 +- lisp/ChangeLog | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 812ec0214b0..c7dd1d3fa82 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,4 +1,4 @@ -2012-05-12 Andreas Schwab +2012-05-14 Andreas Schwab * cc-mode.texi: Avoid space before macro in 4th argument of cross reference commands. (Bug#11461) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b833e61bfa2..0d1c3529a14 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,9 +1,3 @@ -2012-05-14 Troels Nielsen (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 * net/rlogin.el (rlogin-mode-map): Fix last change. -- 2.39.2