From: OKAZAKI Tetsurou Date: Wed, 7 Sep 2011 07:15:42 +0000 (-0700) Subject: cc-fonts.el fix for bug#9443 (tiny change) X-Git-Tag: emacs-pretest-24.0.90~104^2~147 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ff7271b99367cbaf2fd6c345f6a53fbc7d0ba870;p=emacs.git cc-fonts.el fix for bug#9443 (tiny change) * lisp/progmodes/cc-fonts.el (c-font-lock-enclosing-decls): Check for null c-opt-block-decls-with-vars-key. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 310fb42a155..2efe3a5e7fe 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-09-07 OKAZAKI Tetsurou (tiny change) + + * progmodes/cc-fonts.el (c-font-lock-enclosing-decls): + Check for null c-opt-block-decls-with-vars-key. (Bug#9443) + 2011-09-07 Leo Liu * net/rcirc.el (rcirc-mode): Conditionally initialize diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index bca95c97e8b..a0089dc1e24 100644 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el @@ -1559,7 +1559,8 @@ casts and declarations are fontified. Used on level 2 and higher." (setq decl-context (c-beginning-of-decl-1) in-typedef (looking-at c-typedef-key)) (if in-typedef (c-forward-token-2)) - (when (looking-at c-opt-block-decls-with-vars-key) + (when (and c-opt-block-decls-with-vars-key + (looking-at c-opt-block-decls-with-vars-key)) (goto-char ps-elt) (when (c-safe (c-forward-sexp)) (c-forward-syntactic-ws)