summaryrefslogtreecommitdiff
path: root/.clang-format
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2019-11-13 21:47:43 +0100
committerMiklos Vajna <vmiklos@collabora.com>2019-11-14 08:30:47 +0100
commit45324a9a405ffbd913ede64f3f5099b2c325539e (patch)
treec86e1b8c3d969ec6452befaeefe9fb15ff02f397 /.clang-format
parentcc5483c3a3657b1b3c249d1ab039feda4bc50cfe (diff)
clang-format: don't fix up namespace comments
Out clang-format-5.0.0 has this default, i.e. running solenv/clang-format/reformat-formatted-files after this change results in no changes. However, clang-format from git has that enabled by default for our config, so prepare for that unwanted change now. (5.0.0 gives no "unknown configuration key" errors for "FixNamespaceComments".) [ Still touch a formatted file to make sure CI tests the new config before it goes in. ] Change-Id: Ic4500e067cfb2dc10dc1f452598e8932771b31c9 Reviewed-on: https://gerrit.libreoffice.org/82636 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to '.clang-format')
-rw-r--r--.clang-format1
1 files changed, 1 insertions, 0 deletions
diff --git a/.clang-format b/.clang-format
index 797f22404a09..d16c2f72d040 100644
--- a/.clang-format
+++ b/.clang-format
@@ -19,6 +19,7 @@ IndentCaseLabels: true
KeepEmptyLinesAtTheStartOfBlocks: false
MaxEmptyLinesToKeep: 1
NamespaceIndentation: None
+FixNamespaceComments: false
ObjCSpaceBeforeProtocolList: true
PenaltyBreakBeforeFirstCallParameter: 19
PenaltyBreakComment: 60