summaryrefslogtreecommitdiff
path: root/lisp/progmodes/cc-styles.el
diff options
context:
space:
mode:
authorAlan Mackenzie <acm@muc.de>2008-01-27 13:59:47 +0000
committerAlan Mackenzie <acm@muc.de>2008-01-27 13:59:47 +0000
commit4fae8922bea01886f04e534c26b12f2876fefb80 (patch)
tree385463cf69533f0aaccf73959e2bd260eab24a96 /lisp/progmodes/cc-styles.el
parent3e5558010a804bfda1b176b93b81af4eceeb2cb7 (diff)
downloademacs-4fae8922bea01886f04e534c26b12f2876fefb80.tar.gz
Introduce elements for the syntactic symbol arglist-cont-nonempty into
c-hanging-braces-alist. Amend pertinent functions and 5 styles.
Diffstat (limited to 'lisp/progmodes/cc-styles.el')
-rw-r--r--lisp/progmodes/cc-styles.el15
1 files changed, 10 insertions, 5 deletions
diff --git a/lisp/progmodes/cc-styles.el b/lisp/progmodes/cc-styles.el
index 41f1836c0a4..26596e42ae8 100644
--- a/lisp/progmodes/cc-styles.el
+++ b/lisp/progmodes/cc-styles.el
@@ -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 . +)