diff options
| author | Glenn Morris | 2015-04-03 11:11:15 -0400 |
|---|---|---|
| committer | Glenn Morris | 2015-04-03 11:11:15 -0400 |
| commit | f3b70a795bd521fe08e18a5307c67831ab77c96d (patch) | |
| tree | b94f0d128b55cb38a75582278ac243c763414d93 | |
| parent | 07432a8c2d916382127e8a2021e9088f10dca8e2 (diff) | |
| download | emacs-f3b70a795bd521fe08e18a5307c67831ab77c96d.tar.gz emacs-f3b70a795bd521fe08e18a5307c67831ab77c96d.zip | |
; ChangeLog fix
| -rw-r--r-- | lisp/ChangeLog | 8 |
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 @@ | |||
| 1 | 2015-04-03 Alan Mackenzie <acm@muc.de> | 1 | 2015-04-03 Alan Mackenzie <acm@muc.de> |
| 2 | 2 | ||
| 3 | * Revert CC Mode change from 2015-01-31 "Handle "#" operater | 3 | * progmodes/cc-mode.el (c-font-lock-init): Revert 2015-02-01 change |
| 4 | properly inside macro". | 4 | "Stop Font Lock forcing fontification from BOL." (Bug#20245) |
| 5 | 5 | ||
| 6 | 2015-04-01 Michael Albinus <michael.albinus@gmx.de> | 6 | 2015-04-01 Michael Albinus <michael.albinus@gmx.de> |
| 7 | 7 | ||
| @@ -203,10 +203,8 @@ | |||
| 203 | 2015-02-01 Alan Mackenzie <acm@muc.de> | 203 | 2015-02-01 Alan Mackenzie <acm@muc.de> |
| 204 | 204 | ||
| 205 | CC Mode: Stop Font Lock forcing fontification from BOL. | 205 | CC Mode: Stop Font Lock forcing fontification from BOL. |
| 206 | Fixes debbugs#19669. | ||
| 207 | |||
| 208 | * progmodes/cc-mode.el (c-font-lock-init): | 206 | * progmodes/cc-mode.el (c-font-lock-init): |
| 209 | Setq font-lock-extend-region-functions to nil. | 207 | Setq font-lock-extend-region-functions to nil. (Bug#19669) |
| 210 | 208 | ||
| 211 | 2015-01-31 Alan Mackenzie <acm@muc.de> | 209 | 2015-01-31 Alan Mackenzie <acm@muc.de> |
| 212 | 210 | ||