[Emacs-diffs] Changes to emacs/lisp/progmodes/cc-styles.el,v

[Alan Mackenzie]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Alan Mackenzie <acmacm> 08/01/27 13:59:48

Index: cc-styles.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/cc-styles.el,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- cc-styles.el        8 Jan 2008 20:46:17 -0000       1.47
+++ cc-styles.el        27 Jan 2008 13:59:47 -0000      1.48
@@ -58,7 +58,8 @@
   '(("gnu"
      (c-basic-offset . 2)
      (c-comment-only-line-offset . (0 . 0))
-     (c-hanging-braces-alist     . ((substatement-open before after)))
+     (c-hanging-braces-alist     . ((substatement-open before after)
+                                   (arglist-cont-nonempty)))
      (c-offsets-alist . ((statement-block-intro . +)
                         (knr-argdecl-intro . 5)
                         (substatement-open . +)
@@ -170,7 +171,8 @@
                          (case-label           . +)
                          (access-label         . -)
                          (inclass              . ++)
-                        (inline-open          . 0))))
+                        (inline-open          . 0)
+                        (arglist-cont-nonempty))))
 
     ("linux"
      (c-basic-offset  . 8)
@@ -178,7 +180,8 @@
      (c-hanging-braces-alist . ((brace-list-open)
                                (brace-entry-open)
                                (substatement-open after)
-                               (block-close . c-snug-do-while)))
+                               (block-close . c-snug-do-while)
+                               (arglist-cont-nonempty)))
      (c-cleanup-list . (brace-else-brace))
      (c-offsets-alist . ((statement-block-intro . +)
                         (knr-argdecl-intro     . 0)
@@ -200,7 +203,8 @@
                                (brace-list-close)
                                (brace-entry-open)
                                (substatement-open after)
-                               (block-close . c-snug-do-while)))
+                               (block-close . c-snug-do-while)
+                               (arglist-cont-nonempty)))
      (c-block-comment-prefix . ""))
 
     ("java"
@@ -230,7 +234,8 @@
      (c-hanging-braces-alist . ((defun-open after)
                                (defun-close . c-snug-1line-defun-close)
                                (substatement-open after)
-                               (block-close . c-snug-do-while)))
+                               (block-close . c-snug-do-while)
+                               (arglist-cont-nonempty)))
      (c-hanging-semi&comma-criteria . nil)
      (c-cleanup-list . nil)            ; You might want one-liner-defun here.
      (c-offsets-alist . ((statement-block-intro . +)