CC Mode 5.29 (); a recent incompatible identation change

CC Mode 5.29 (); a recent incompatible identation change

[Sam Steingold]

The identation of the following form has changed from

        foo(bar,baz, {
          zot;
        });

to

        foo(bar,baz, {
              zot;
            });

recently in the CVS emacs.
was it an intentional change?
how to I revert it in my .emacs.el?
thanks.

Emacs  : GNU Emacs 21.2.50.7 (i686-pc-linux-gnu, X toolkit, Xaw3d scroll bars)
 of 2002-05-13 on glip.premonitia.com
Package: CC Mode 5.29 ()
Buffer Style: gnu

c-emacs-features: (1-bit)

current state:
==============
(setq
 c-basic-offset 2
 c-comment-only-line-offset '(0 . 0)
 c-indent-comment-alist '((anchored-comment column . 0) (end-block space . 1)
                          (cpp-end-block space . 2))
 c-indent-comments-syntactically-p nil
 c-block-comment-prefix ""
 c-comment-prefix-regexp '((pike-mode . "//+!?\\|\\**") (other . "//+\\|\\**"))
 c-cleanup-list '(scope-operator brace-else-brace brace-elseif-brace
                  empty-defun-braces defun-close-semi list-close-comma)
 c-hanging-braces-alist '((class-open after) (defun-open after)
                          (block-close . c-snug-do-while) (inline-open after)
                          (substatement-open after) (brace-list-open))
 c-hanging-colons-alist nil
 c-hanging-semi&comma-criteria '(c-semi&comma-inside-parenlist)
 c-backslash-column 48
 c-backslash-max-column 72
 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 . c-lineup-topmost-intro-cont)
                   (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 . +)
                   (access-label . -)
                   (do-while-closure . 0)
                   (else-clause . 0)
                   (catch-clause . 0)
                   (comment-intro
                    c-lineup-knr-region-comment
                    c-lineup-comment
                    )
                   (arglist-cont c-lineup-gcc-asm-reg 0)
                   (arglist-cont-nonempty
                    c-lineup-gcc-asm-reg
                    c-lineup-arglist
                    )
                   (stream-op . c-lineup-streamop)
                   (inclass . +)
                   (cpp-macro . d-mode-indent-sharp)
                   (cpp-macro-cont . +)
                   (cpp-define-intro c-lineup-cpp-define +)
                   (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 . +)
                   (inexpr-class . +)
                   (statement-block-intro . +)
                   (knr-argdecl-intro . 5)
                   (substatement-open . +)
                   (substatement-label . 0)
                   (label . *)
                   (statement-case-open . +)
                   (statement-cont . +)
                   (arglist-intro . c-lineup-arglist-intro-after-paren)
                   (arglist-close . c-lineup-arglist)
                   (inline-open . 0)
                   (brace-list-open . +)
                   )
 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 8
 comment-column 32
 parse-sexp-ignore-comments t
 auto-fill-function nil
 comment-multi-line t
 comment-start-skip "/\\*+ *\\|//+ *"
 fill-prefix nil
 paragraph-start "[ 	]*\\(//+\\|\\**\\)[ 	]*$\\|^\f"
 adaptive-fill-mode t
 adaptive-fill-regexp "[ 	]*\\(//+\\|\\**\\)[ 	]*\\([ 	]*\\([-!|#%;>*]+[ 	]*\\|(?[0-9]+[.)][ 	]*\\)*\\)"
 )
-- 
Sam Steingold (http://www.podval.org/~sds) running RedHat7.2 GNU/Linux
<http://www.camera.org> <http://www.iris.org.il> <http://www.memri.org/>
<http://www.mideasttruth.com/> <http://www.palestine-central.com/links.html>
War doesn't determine who's right, just who's left.

Re: CC Mode 5.29 (); a recent incompatible identation change

[Martin Stjernholm]

Sam Steingold <sds@gnu.org> wrote:

> The identation of the following form has changed from
> 
>         foo(bar,baz, {
>           zot;
>         });
> 
> to
> 
>         foo(bar,baz, {
>               zot;
>             });
> 
> recently in the CVS emacs.
> was it an intentional change?

Yes. It is to achieve better consistency with cases like this:

    foo(bar,baz,
	{
	    zot;
	});
    foo(bar, {
	    zot;
	},
	baz);

where the latter previously was indented as:

    foo(bar, {
	zot;
    },
	baz);

which imo looks odd, especially if "foo" is a long identifier or
expression.

> how to I revert it in my .emacs.el?

With something like this:

    (defun indent-to-boi (langelem)
      (save-excursion
        (goto-char (cdr langelem))
        (back-to-indentation)
        (vector (current-column))))

    (defun indent-to-boi+offset (langelem)
      (save-excursion
        (goto-char (cdr langelem))
        (back-to-indentation)
        (vector (+ (current-column) c-basic-offset))))

    (c-set-offset 'block-close 'indent-to-boi)
    (c-set-offset 'statement-block-intro 'indent-to-boi+offset)

Re: CC Mode 5.29 (); a recent incompatible identation change

[Sam Steingold]

> * In message <5bheku7wjm.fsf@lister.roxen.com>
> * On the subject of "Re: CC Mode 5.29 (); a recent incompatible identation change"
> * Sent on 26 May 2002 17:34:21 +0200
> * Honorable Martin Stjernholm <mast@lysator.liu.se> writes:
>
> Sam Steingold <sds@gnu.org> wrote:
> 
> > The identation of the following form has changed from
> > 
> >         foo(bar,baz, {
> >           zot;
> >         });
> > 
> > to
> > 
> >         foo(bar,baz, {
> >               zot;
> >             });
> > 
> > recently in the CVS emacs.
> > was it an intentional change?
> 
> Yes. It is to achieve better consistency with cases like this:
> 
>     foo(bar,baz,
> 	{
> 	    zot;
> 	});
>     foo(bar, {
> 	    zot;
> 	},
> 	baz);
> 
> where the latter previously was indented as:
> 
>     foo(bar, {
> 	zot;
>     },
> 	baz);
> 
> which imo looks odd, especially if "foo" is a long identifier or
> expression.

the new method gives _much_ larger indentation resulting in less
readable code, expecially when "foo" is _really_ long.

> > how to I revert it in my .emacs.el?
> 
> With something like this:
> 
>     (defun indent-to-boi (langelem)
>       (save-excursion
>         (goto-char (cdr langelem))
>         (back-to-indentation)
>         (vector (current-column))))
> 
>     (defun indent-to-boi+offset (langelem)
>       (save-excursion
>         (goto-char (cdr langelem))
>         (back-to-indentation)
>         (vector (+ (current-column) c-basic-offset))))
> 
>     (c-set-offset 'block-close 'indent-to-boi)
>     (c-set-offset 'statement-block-intro 'indent-to-boi+offset)

thanks.
it would be nice if there were a customization option, e.g.
`cc-mode-indent-statement-block', with-values 'boi (old) and
'statement+boi (new).

-- 
Sam Steingold (http://www.podval.org/~sds) running RedHat7.2 GNU/Linux
<http://www.camera.org> <http://www.iris.org.il> <http://www.memri.org/>
<http://www.mideasttruth.com/> <http://www.palestine-central.com/links.html>
Trespassers will be shot.  Survivors will be prosecuted.

Re: CC Mode 5.29 (); a recent incompatible identation change

[Sam Steingold]

> * In message <5bheku7wjm.fsf@lister.roxen.com>
> * On the subject of "Re: CC Mode 5.29 (); a recent incompatible identation change"
> * Sent on 26 May 2002 17:34:21 +0200
> * Honorable Martin Stjernholm <mast@lysator.liu.se> writes:
>
> Sam Steingold <sds@gnu.org> wrote:
> 
> > The identation of the following form has changed from
> > 
> >         foo(bar,baz, {
> >           zot;
> >         });
> > 
> > to
> > 
> >         foo(bar,baz, {
> >               zot;
> >             });
> > 
> > recently in the CVS emacs.
> > was it an intentional change?
> 
> Yes. It is to achieve better consistency with cases like this:
> 
>     foo(bar,baz,
> 	{
> 	    zot;
> 	});
>     foo(bar, {
> 	    zot;
> 	},
> 	baz);
> 
> where the latter previously was indented as:
> 
>     foo(bar, {
> 	zot;
>     },
> 	baz);
> 
> which imo looks odd, especially if "foo" is a long identifier or
> expression.

the new method gives _much_ larger indentation resulting in less
readable code, expecially when "foo" is _really_ long.

> > how to I revert it in my .emacs.el?
> 
> With something like this:
> 
>     (defun indent-to-boi (langelem)
>       (save-excursion
>         (goto-char (cdr langelem))
>         (back-to-indentation)
>         (vector (current-column))))
> 
>     (defun indent-to-boi+offset (langelem)
>       (save-excursion
>         (goto-char (cdr langelem))
>         (back-to-indentation)
>         (vector (+ (current-column) c-basic-offset))))
> 
>     (c-set-offset 'block-close 'indent-to-boi)
>     (c-set-offset 'statement-block-intro 'indent-to-boi+offset)

thanks.
it would be nice if there were a customization option, e.g.
`cc-mode-indent-statement-block', with-values 'boi (old) and
'statement+boi (new).

-- 
Sam Steingold (http://www.podval.org/~sds) running RedHat7.2 GNU/Linux
<http://www.camera.org> <http://www.iris.org.il> <http://www.memri.org/>
<http://www.mideasttruth.com/> <http://www.palestine-central.com/links.html>
Trespassers will be shot.  Survivors will be prosecuted.

Re: CC Mode 5.29 (); a recent incompatible identation change

[Martin Stjernholm]

Sam Steingold <sds@gnu.org> wrote:

> > > The identation of the following form has changed from
> > > 
> > >         foo(bar,baz, {
> > >           zot;
> > >         });
> > > 
> > > to
> > > 
> > >         foo(bar,baz, {
> > >               zot;
> > >             });
/.../
> the new method gives _much_ larger indentation resulting in less
> readable code, expecially when "foo" is _really_ long.

That is a general problem in the indentation of function arguments,
not just when they have nested code blocks. I deal with it by
inserting a line break after the open parenthesis, treating it much
like a brace block opener:

    some_really_long_function_identifier (
        bar, {
            zot;
        },
        baz);

> it would be nice if there were a customization option, e.g.
> `cc-mode-indent-statement-block', with-values 'boi (old) and
> 'statement+boi (new).

The problem really lies in the indentation of arglist-cont-nonempty,
which is usually set to c-lineup-arglist. It ought to be possible to
get approximately the identation you want in a consistent manner by
setting arglist-cont-nonempty to + instead. Currently it isn't, since
statement-block-intro and block-close aren't stacked with
arglist-cont-nonempty. I'll fix that.