CC Mode 5.28 (); JavaScript indentation problem

[Robert Ginda]

I've been using the C++ variant of CC-mode for JavaScript files and noticed a 
slight indentation problem.  Here's the deal...

1: Foo.prototype.doFoo =
2: function foo()
3: {
4:     if (this.bar)
5:     this.baz();  // XXX This line is indented incorrectly
6: }

Line 5 is considered a brace-list-entry, instead of a substatement, and so is 
indented 0 instead of +.  It seems the '=' in line 1 is confusing the syntatic 
match.

I've been using C++-mode for JS editing for more than a year now, and found it 
to be Good Enough in just about all other situations.  Unfortunatley, I don't 
have the lisp (or cc-mode) knowledge required to fix this myself.

Rob.


Emacs  : XEmacs 21.1 (patch 14) "Cuyahoga Valley" [Lucid] (i386-redhat-linux, 
Mule) of Thu Mar 22 2001 on porky.devel.redhat.com
Package: CC Mode 5.28 (C++)
Buffer Style: gnu

c-emacs-features: (8-bit)

current state:
==============
(setq
 c-basic-offset 4
 c-comment-only-line-offset '(0 . 0)
 c-block-comment-prefix ""
 c-comment-prefix-regexp '((pike-mode . "//+!?\\|\\**") (other . "//+\\|\\**"))
 c-cleanup-list '(scope-operator)
 c-hanging-braces-alist '((brace-list-open) (brace-entry-open)
                          (substatement-open after)
                          (block-close . c-snug-do-while)
                          (extern-lang-open after) (inexpr-class-open after)
                          (inexpr-class-close before))
 c-hanging-colons-alist nil
 c-hanging-semi&comma-criteria '(c-semi&comma-inside-parenlist)
 c-backslash-column 48
 c-label-minimum-indentation 1
 c-offsets-alist '((string . c-lineup-dont-change)
                   (c . c-lineup-C-comments)
                   (defun-open . 0)
                   (defun-close . 0)
                   (defun-block-intro . +)
                   (class-open . 0)
                   (class-close . 0)
                   (inline-close . 0)
                   (func-decl-cont . +)
                   (knr-argdecl . 0)
                   (topmost-intro . 0)
                   (topmost-intro-cont . 0)
                   (member-init-intro . +)
                   (member-init-cont . c-lineup-multi-inher)
                   (inher-intro . +)
                   (inher-cont . c-lineup-multi-inher)
                   (block-open . 0)
                   (block-close . 0)
                   (brace-list-close . 0)
                   (brace-list-intro . +)
                   (brace-list-entry . 0)
                   (brace-entry-open . 0)
                   (statement . 0)
                   (statement-case-intro . +)
                   (substatement . +)
                   (case-label . 0)
                   (access-label . -)
                   (do-while-closure . 0)
                   (else-clause . 0)
                   (catch-clause . 0)
                   (comment-intro . c-lineup-comment)
                   (arglist-cont . 0)
                   (arglist-cont-nonempty . c-lineup-arglist)
                   (stream-op . c-lineup-streamop)
                   (inclass . +)
                   (cpp-macro . [0])
                   (cpp-macro-cont . c-lineup-dont-change)
                   (friend . 0)
                   (objc-method-intro . [0])
                   (objc-method-args-cont . c-lineup-ObjC-method-args)
                   (objc-method-call-cont . c-lineup-ObjC-method-call)
                   (extern-lang-open . 0)
                   (extern-lang-close . 0)
                   (inextern-lang . +)
                   (namespace-open . 0)
                   (namespace-close . 0)
                   (innamespace . +)
                   (template-args-cont c-lineup-template-args +)
                   (inlambda . c-lineup-inexpr-block)
                   (lambda-intro-cont . +)
                   (inexpr-statement . 0)
                   (inexpr-class . +)
                   (statement-block-intro . +)
                   (knr-argdecl-intro . 5)
                   (label . 0)
                   (statement-case-open . +)
                   (statement-cont . +)
                   (arglist-intro . c-lineup-arglist-intro-after-paren)
                   (arglist-close . c-lineup-arglist)
                   (inline-open . 0)
                   (brace-list-open . +)
                   (substatement-open . 0)
                   )
 c-delete-function 'delete-char
 c-electric-pound-behavior nil
 c-indent-comments-syntactically-p nil
 c-tab-always-indent t
 defun-prompt-regexp nil
 tab-width 4
 comment-column 32
 parse-sexp-ignore-comments t
 signal-error-on-buffer-boundary t
 auto-fill-function nil
 comment-multi-line t
 comment-start-skip "/\\*+ *\\|//+ *"
 fill-prefix nil
 paragraph-start "[        ]*\\(//+\\|\\**\\)[     ]*$\\|^"
 adaptive-fill-mode t
 adaptive-fill-regexp "[   ]*\\(//+\\|\\**\\)[     ]*\\([  ]*\\([#;>*]+ 
+\\)?\\)"
 )