From: Glenn Morris <rgm@gnu.org>
Date: Fri, 3 Apr 2015 15:11:15 +0000 (-0400)
Subject: ; ChangeLog fix
X-Git-Tag: emacs-24.5-rc3~3
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f3b70a795bd521fe08e18a5307c67831ab77c96d;p=emacs.git

; ChangeLog fix
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cb96110f10f..da540708ef7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,7 @@
 2015-04-03  Alan Mackenzie  <acm@muc.de>
 
-	* Revert CC Mode change from 2015-01-31 "Handle "#" operater
-	properly inside macro".
+	* progmodes/cc-mode.el (c-font-lock-init): Revert 2015-02-01 change
+	"Stop Font Lock forcing fontification from BOL."  (Bug#20245)
 
 2015-04-01  Michael Albinus  <michael.albinus@gmx.de>
 
@@ -203,10 +203,8 @@
 2015-02-01  Alan Mackenzie  <acm@muc.de>
 
 	CC Mode: Stop Font Lock forcing fontification from BOL.
-	Fixes debbugs#19669.
-
 	* progmodes/cc-mode.el (c-font-lock-init):
-	Setq font-lock-extend-region-functions to nil.
+	Setq font-lock-extend-region-functions to nil.  (Bug#19669)
 
 2015-01-31  Alan Mackenzie  <acm@muc.de>