Merge pull request #415 from fallchildren/master

Fix delayed font-locking issue

Author: zonuexe

php-mode.el

@@ -485,9 +485,11 @@ SYMBOL
   php nil)
 
 (c-lang-defconst c-before-font-lock-functions
-  php (if (fboundp #'c-depropertize-new-text)
-          '(c-depropertize-new-text)
-        nil))
+  php (let (functions)
+        (when (fboundp #'c-change-expand-fl-region)
+          (cl-pushnew 'c-change-expand-fl-region functions))
+        (when (fboundp #'c-depropertize-new-text)
+          (cl-pushnew 'c-depropertize-new-text functions))))
 
 ;; Make php-mode recognize opening tags as preprocessor macro's.
 ;;