Further updates to clang-format config

[ci skip]
wesnoth · Apr 23, 2017 · 51a3954 · 51a3954
1 parent 21512d4
commit 51a3954
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/.clang-format b/src/.clang-format
@@ -2,10 +2,11 @@ Language:        Cpp
 AccessModifierOffset: -4
 AlignEscapedNewlinesLeft: false
 AlignTrailingComments: true
+AlignAfterOpenBracket: DontAlign
 AllowAllParametersOfDeclarationOnNextLine: true
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Inline
 AlwaysBreakTemplateDeclarations: true
 AlwaysBreakBeforeMultilineStrings: false
 BreakBeforeBinaryOperators: true
@@ -27,7 +28,7 @@ BraceWrapping:
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: true
 BinPackParameters: false
-ColumnLimit: 0
+ColumnLimit: 120
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 8