Re: lisp/progmodes/cc-styles.el indentation broken in ellemtel mode

[crash@vmlinux.org (Joachim Nilsson)]

[-- Attachment #1: Type: text/plain, Size: 552 bytes --]

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

[-- Attachment #2: cc-styles.diff --]
[-- Type: text/plain, Size: 1094 bytes --]

Index: lisp/progmodes/cc-styles.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/cc-styles.el,v
retrieving revision 1.51
diff -u -r1.51 cc-styles.el
--- 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)