Re: For 23.1 release ... please. (Was: Re: lisp/progmodes/cc-styles.el indentation broken in ellemtel mode)

["Andrew W. Nosenko" <andrew.w.nosenko@gmail.com>]

2008/7/27 Joachim Nilsson <joachim.nilsson@vmlinux.org>:
> PING?
>
> This patch, now with a ChangeLog entry, could be quite useful to get
> into the release.
>
> Regards
>  /Jocke
>
> Joachim Nilsson wrote, on 07/17/2008 02:53 AM:
>> On Wed, Jul 16, 2008 at 06:25:55PM +0300, Andrew W. Nosenko wrote:
>>
>>> On Tue, Jul 15, 2008 at 3:44 PM, Joachim Nilsson <crash@vmlinux.org> wrote:
>>>
>>>> The Ellemtel C/C++ indentation engine has been broken on trunk since
>>>> around March.
>>>>
>>> Beside removing (arglist-cont-nonempty) from the c-offsets-alist, you
>>> need add it to the c-hanging-braces-alist, just like it done for all
>>> other styles.  IMHO, current difference of "ellemtel" from an other
>>> styles was just a typo.
>>>
>>
>> Yep, that seems about right.  Attached is a revised patch.
>>
>> Regards
>>  /Jocke
>>
>
>
> --- lisp/ChangeLog      27 Jul 2008 02:28:46 -0000      1.14226
> +++ lisp/ChangeLog      27 Jul 2008 17:32:00 -0000
> @@ -1,3 +1,9 @@
> +2008-07-27  Joachim Nilsson  <joachim.nilsson@member.fsf.org>
> +
> +       * progmodes/cc-styles.el: For the Ellemtel style, move
> +       the (arglist-cont-nonempty) from c-offsets-alist to
> +       c-hanging-braces-alist like other styles already have.
> +
>  2008-07-26  Adrian Robert  <Adrian.B.Robert@gmail.com>
>
>        * term/ns-win.el (ns-extended-platform-support-mode): Get rid of
> --- lisp/progmodes/cc-styles.el 6 May 2008 07:18:15 -0000       1.51
> +++ lisp/progmodes/cc-styles.el 17 Jul 2008 00:45:35 -0000
> @@ -162,15 +162,15 @@
>     ("ellemtel"
>      (c-basic-offset . 3)
>      (c-comment-only-line-offset . 0)
> -     (c-hanging-braces-alist     . ((substatement-open before after)))
> +     (c-hanging-braces-alist     . ((substatement-open before after)
> +                                   (arglist-cont-nonempty)))
>      (c-offsets-alist . ((topmost-intro        . 0)
>                         (substatement         . +)
>                         (substatement-open    . 0)
>                          (case-label           . +)
>                          (access-label         . -)
> -                         (inclass              . ++)
> -                        (inline-open          . 0)
> -                        (arglist-cont-nonempty))))
> +                         (inclass              . +)
> +                        (inline-open          . 0))))
>
>     ("linux"
>      (c-basic-offset  . 8)
>
>

Your patch changes 'inclass' from
    (inclass . ++)
to
    (inclass . +)

Is it intentional?

-- 
Andrew W. Nosenko <andrew.w.nosenko@gmail.com>