CC Mode 5.25 (C++); Base class initialization list with templates

[Wolfgang Bangerth (Laptop)]

Dear Barry and Martin,

in base class and member initialization lists, when one base is a
template class, then indentation of all following members is no more
in the correct column. Test case is appended, note the indentation of
the member variable "i" after the "Base<int>" base.

Regards
  Wolfgang


template <class T> class Base {};

class Derived : public Base<int> {
    Derived ()
                    :
                    Base<int> (),
      i (1)
      {};

    int i;
};

-------------------------------------------------------------------------
Wolfgang Bangerth                  email:           bangerth@math.ethz.ch
                                   www: http://www.math.ethz.ch/~bangerth


Emacs  : GNU Emacs 20.7.1 (i386-suse-linux, X toolkit)
 of Die Sep 25 2001 on hewitt
Package: CC Mode 5.25 (C++)
Buffer Style: gnu


c-emacs-features: (1-bit)

current state:
==============
(setq
 c-basic-offset 2
 c-offsets-alist '((string . 0)
                   (c . c-lineup-C-comments)
                   (defun-open . 0)
                   (defun-close . 0)
                   (defun-block-intro . +)
                   (class-open . 0)
                   (class-close . 0)
                   (inline-open . +)
                   (inline-close . 0)
                   (func-decl-cont . +)
                   (knr-argdecl-intro . +)
                   (knr-argdecl . 0)
                   (topmost-intro . 0)
                   (topmost-intro-cont . 0)
                   (member-init-intro . 16)
                   (member-init-cont . 0)
                   (inher-intro . +)
                   (inher-cont . c-lineup-multi-inher)
                   (block-open . 0)
                   (block-close . 0)
                   (brace-list-open . 0)
                   (brace-list-close . 0)
                   (brace-list-intro . 6)
                   (brace-list-entry . 0)
                   (brace-entry-open . 0)
                   (statement . c-lineup-runin-statements)
                   (statement-cont . c-lineup-math)
                   (statement-block-intro . +)
                   (statement-case-intro . 6)
                   (statement-case-open . 0)
                   (substatement . +)
                   (substatement-open . +)
                   (case-label . +)
                   (access-label . -)
                   (label . 2)
                   (do-while-closure . 0)
                   (else-clause . 0)
                   (catch-clause . 0)
                   (comment-intro . c-lineup-comment)
                   (arglist-intro . +)
                   (arglist-cont . 0)
                   (arglist-cont-nonempty . c-lineup-arglist)
                   (arglist-close . 0)
                   (stream-op . c-lineup-streamop)
                   (inclass . ++)
                   (cpp-macro . -1000)
                   (cpp-macro-cont . c-lineup-dont-change)
                   (friend . 0)
                   (objc-method-intro . -1000)
                   (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 . +)
                   (inlambda . c-lineup-inexpr-block)
                   (lambda-intro-cont . +)
                   (inexpr-statement . 0)
                   (inexpr-class . +)
                   )
 c-cleanup-list '(empty-defun-braces defun-close-semi list-close-comma
                  scope-operator)
 c-comment-only-line-offset 33
 c-backslash-column 48
 c-delete-function 'delete-char
 c-electric-pound-behavior nil
 c-hanging-braces-alist '((defun-open before after) (defun-close before 
after)
                          (class-open before after) (class-close after)
                          (inline-open before after)
                          (inline-close before after)
                          (block-open before after) (block-close after)
                          (brace-list-open nil))
 c-hanging-colons-alist '((member-init-intro after) (inher-intro after)
                          (label after) (case-label after)
                          (access-label after))
 c-hanging-comment-starter-p nil
 c-hanging-comment-ender-p nil
 c-indent-comments-syntactically-p nil
 c-tab-always-indent t
 c-comment-continuation-stars ""
 c-label-minimum-indentation 1
 defun-prompt-regexp nil
 tab-width 8
 comment-column 32
 )