From: Alan Mackenzie Date: Sat, 20 Aug 2011 14:54:21 +0000 (+0000) Subject: Fontify CPP expressions correctly when starting in the middle of such a X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~70^2~15^2~37 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=826cee649d749f010391a5c36bb9ef4e89ad28c1;p=emacs.git Fontify CPP expressions correctly when starting in the middle of such a construct. Mainly for when jit-lock etc. starts a chunk here. cc-fonts.el (c-font-lock-context): new buffer local variable. (c-make-font-lock-search-form): new function, extracted from c-make-font-lock-search-function. (c-make-font-lock-search-function): Use the above function. (c-make-font-lock-context-search-function): New function. (c-cpp-matchers): Enhance the preprocessor expression case with the above function (c-font-lock-complex-decl-prepare): Test for being in a CPP form which takes an expression. cc-langs.el (c-cpp-expr-intro-re): New lang-variable. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f2a41ec16d1..f47ff5f1d0e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,22 @@ +2011-08-20 Alan Mackenzie + + * Fontify CPP expressions correctly when starting in the middle of + such a construct. Mainly for when jit-lock etc. starts a chunk + here. + + * progmodes/cc-fonts.el (c-font-lock-context): new buffer local + variable. + (c-make-font-lock-search-form): new function, extracted from + c-make-font-lock-search-function. + (c-make-font-lock-search-function): Use the above function. + (c-make-font-lock-context-search-function): New function. + (c-cpp-matchers): Enhance the preprocessor expression case with + the above function + (c-font-lock-complex-decl-prepare): Test for being in a CPP form + which takes an expression. + + * progmodes/cc-langs.el (c-cpp-expr-intro-re): New lang-variable. + 2011-08-20 Martin Rudalics * window.el (display-buffer-reuse-window)