From f6117ef754d9b02433dadaf61e72df0d7391e40a Mon Sep 17 00:00:00 2001 From: Alan Mackenzie Date: Sat, 9 Jan 2016 15:18:29 +0000 Subject: [PATCH] Allow the use of `font-lock-extend-region-multiline' in CC Mode. * lisp/progmodes/cc-mode.el (c-font-lock-init): Remove `font-lock-extend-regions-wholelines' from `font-lock-extend-region-functions' rather than setting the latter to nil. --- lisp/progmodes/cc-mode.el | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index 644065911dd..738870b727a 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -1336,12 +1336,13 @@ This function is called from `c-common-init', once per mode initialization." . 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. + ;; fontify to whole lines by removing `font-lock-extend-region-wholelines' + ;; 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)) + (setq font-lock-extend-region-functions + (delq 'font-lock-extend-region-wholelines + font-lock-extend-region-functions))) (make-local-variable 'font-lock-fontify-region-function) (setq font-lock-fontify-region-function 'c-font-lock-fontify-region) -- 2.39.2