Fix the CC Mode fixes from 2015-03-30. Fixes debbugs#20240.

* progmodes/cc-mode.el (c-extend-after-change-region): Widen before
applying text properties.
* progmodes/cc-langs.el (c-before-font-lock-functions): Update an entry
to a new function name.

3 files changed, 16 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 46f519ef306..2092447fbcc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2015-04-01  Alan Mackenzie  <acm@muc.de>
+
+        Fix the CC Mode fixes from 2015-03-30.  Fixes debbugs#20240.
+
+        * progmodes/cc-mode.el (c-extend-after-change-region): Widen
+        before applying text properties.
+        * progmodes/cc-langs.el (c-before-font-lock-functions): Update an
+        entry to a new function name.
+
 2015-04-01  Paul Eggert  <eggert@cs.ucla.edu>
 
         * emacs-lisp/package.el: Spelling fixes and use active voice.
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index c7b24e185c2..ee5a5a6503f 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -495,7 +495,7 @@ parameters \(point-min) and \(point-max).")
 (c-lang-defconst c-before-font-lock-functions
   ;; For documentation see the following c-lang-defvar of the same name.
   ;; The value here may be a list of functions or a single function.
-  t 'c-change-set-fl-decl-start
+  t 'c-change-expand-fl-region
   (c c++ objc) '(c-neutralize-syntax-in-and-mark-CPP
                  c-change-expand-fl-region)
   awk 'c-awk-extend-and-syntax-tablify-region)
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index c95e8a91555..d88fe702c59 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -1330,10 +1330,12 @@ This function is called from `c-common-init', once per mode initialization."
   ;; (the languages with #define) and AWK Mode make non-null use of this
   ;; function.
   (when (eq font-lock-support-mode 'jit-lock-mode)
-    (if (< c-new-BEG beg)
-        (put-text-property c-new-BEG beg 'fontified nil))
-    (if (> c-new-END end)
-        (put-text-property end c-new-END 'fontified nil)))
+    (save-restriction
+      (widen)
+      (if (< c-new-BEG beg)
+          (put-text-property c-new-BEG beg 'fontified nil))
+      (if (> c-new-END end)
+          (put-text-property end c-new-END 'fontified nil))))
   (cons c-new-BEG c-new-END))
 
 ;; Emacs < 22 and XEmacs