--- 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)