diff options
| author | Alan Mackenzie <acm@muc.de> | 2015-04-03 12:22:45 +0000 |
|---|---|---|
| committer | Alan Mackenzie <acm@muc.de> | 2015-04-03 12:22:45 +0000 |
| commit | 07432a8c2d916382127e8a2021e9088f10dca8e2 (patch) | |
| tree | 5d914eeba9698716b23a5d87f197e33587321376 | |
| parent | 0ad5fe01aea8073e2b9f24c322bd1e9c4b83ca9b (diff) | |
| download | emacs-07432a8c2d916382127e8a2021e9088f10dca8e2.tar.gz | |
Revert "CC Mode: Stop Font Lock forcing fontification from BOL. Bug#19669."
This reverts commit d69e9f1c24f37f36af33b0468c5a4e100dbb09b6.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/cc-mode.el | 8 |
2 files changed, 5 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0b3d7c5f107..cb96110f10f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-04-03 Alan Mackenzie <acm@muc.de> + + * Revert CC Mode change from 2015-01-31 "Handle "#" operater + properly inside macro". + 2015-04-01 Michael Albinus <michael.albinus@gmx.de> * net/tramp.el (tramp-handle-unhandled-file-name-directory): diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index 50a700425bf..1cba5027f28 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -1237,14 +1237,6 @@ This function is called from `c-common-init', once per mode initialization." (font-lock-mark-block-function . c-mark-function))) - ;; Prevent `font-lock-default-fontify-region' extending the region it will - ;; fontify to whole lines by removing `font-lock-extend-region-whole-lines' - ;; (and, coincidentally, `font-lock-extend-region-multiline' (which we do - ;; not need)) from `font-lock-extend-region-functions'. (Emacs only). This - ;; fixes Emacs bug #19669. - (when (boundp 'font-lock-extend-region-functions) - (setq font-lock-extend-region-functions nil)) - (make-local-variable 'font-lock-fontify-region-function) (setq font-lock-fontify-region-function 'c-font-lock-fontify-region) |