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 310fb42a1558b98d03a66018380f7c097cc4ed49..2efe3a5e7fee3132b6720d8031064b90003586be 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-07  OKAZAKI Tetsurou  <okazaki.tetsurou@gmail.com>  (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  <sdl.web@gmail.com>
 
        * net/rcirc.el (rcirc-mode): Conditionally initialize

diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index bca95c97e8b1458d5b9ea0f10dd8ee4ea1a11e58..a0089dc1e24e778fe5df345ecc35873e63796ea3 100644 (file)
--- 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)