Revert "CC Mode: Stop Font Lock forcing fontification from BOL. Bug#19669."

This reverts commit d69e9f1c24f37f36af33b0468c5a4e100dbb09b6.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0b3d7c5f107a75ced76600350b120581846f231c..cb96110f10f4be5d1d2bb086613dd37aae397b6c 100644 (file)
--- 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 50a700425bf8bade0f910ff7d960d9e05cc80a65..1cba5027f288533dd96a33921b59b6f35c22f520 100644 (file)
--- 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)