[Emacs-diffs] /srv/bzr/emacs/trunk r105671: cc-fonts.el fix for bug#9443 (tiny change)

[Glenn Morris]

------------------------------------------------------------
revno: 105671
fixes bug(s): http://debbugs.gnu.org/9443
author: OKAZAKI Tetsurou <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2011-09-07 00:15:42 -0700
message:
  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.
modified:
  lisp/ChangeLog
  lisp/progmodes/cc-fonts.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-07 03:37:22 +0000
+++ b/lisp/ChangeLog    2011-09-07 07:15:42 +0000
@@ -1,3 +1,8 @@
+2011-09-07  OKAZAKI Tetsurou  <address@hidden>  (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  <address@hidden>
 
        * net/rcirc.el (rcirc-mode): Conditionally initialize

=== modified file 'lisp/progmodes/cc-fonts.el'
--- a/lisp/progmodes/cc-fonts.el        2011-08-28 11:42:33 +0000
+++ b/lisp/progmodes/cc-fonts.el        2011-09-07 07:15:42 +0000
@@ -1559,7 +1559,8 @@
        (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)