51c51
< __FBSDID("$FreeBSD: head/usr.bin/indent/indent.c 125631 2004-02-09 20:42:08Z bde $");
---
> __FBSDID("$FreeBSD: head/usr.bin/indent/indent.c 125633 2004-02-09 21:48:51Z bde $");
170a171,173
> ps.local_decl_indent = -1; /* if this is not set to some nonnegative value
> * by an arg, we will set this equal to
> * ps.decl_ind */
256a260,261
> if (ps.local_decl_indent < 0) /* if not specified by user, set this */
> ps.local_decl_indent = ps.decl_indent;
909,910c914,922
< dec_ind = ps.decl_indent > 0 ? ps.decl_indent : i;
< use_tabs = ps.decl_indent > 0;
---
> if (ps.ind_level == 0 || ps.dec_nest > 0) {
> /* global variable or struct member in local variable */
> dec_ind = ps.decl_indent > 0 ? ps.decl_indent : i;
> use_tabs = ps.decl_indent > 0;
> } else {
> /* local variable */
> dec_ind = ps.local_decl_indent > 0 ? ps.local_decl_indent : i;
> use_tabs = ps.local_decl_indent > 0;
> }