summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog8
1 files changed, 3 insertions, 5 deletions
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>