cfmt.sh is back

diff --git a/bin/bin/cfmt.sh b/bin/bin/cfmt.sh
new file mode 100755 (executable)
index 0000000..5cf5c4c
--- /dev/null
+++ b/bin/bin/cfmt.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+clang-format60 -style="`cat ~/.clang-format`" $@

diff --git a/clang-format/.clang-format b/clang-format/.clang-format
index 2c6edf9ccb2171acb2eea8dc72ed694822b38f43..4e0d79461a149ff7458f5d1b8fab6451ea9e99b8 100644 (file)
--- a/clang-format/.clang-format
+++ b/clang-format/.clang-format
@@ -1,16 +1,17 @@
-BasedOnStyle: llvm
-ColumnLimit: 88
-IndentWidth: 4
-AlignAfterOpenBracket: AlwaysBreak
-AlignConsecutiveAssignments: true
-AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortBlocksOnASingleLine: true
-AllowShortCaseLabelsOnASingleLine: true
-BinPackArguments: false
-BinPackParameters: false
-BreakBeforeTernaryOperators: false
-BreakStringLiterals: false
-
-BreakBeforeBraces: Custom
-BraceWrapping:
-    AfterFunction: true
+{
+    BasedOnStyle: llvm,
+    ColumnLimit: 88,
+    IndentWidth: 4,
+    AlignAfterOpenBracket: AlwaysBreak,
+    AlignConsecutiveAssignments: true,
+    AllowAllParametersOfDeclarationOnNextLine: false,
+    AllowShortBlocksOnASingleLine: true,
+    BinPackArguments: false,
+    BinPackParameters: false,
+    BreakBeforeTernaryOperators: false,
+    BreakStringLiterals: false,
+    BreakBeforeBraces: Custom,
+    BraceWrapping: {
+        AfterFunction: true,
+    },
+}

diff --git a/vim/.vim/ftplugin/c/autos.vim b/vim/.vim/ftplugin/c/autos.vim
index b0f7c2d6b407578da08a84cbb75950d223836402..1eb3aaed71ea2ef8f7221471f0bd0c6846f02390 100644 (file)
--- a/vim/.vim/ftplugin/c/autos.vim
+++ b/vim/.vim/ftplugin/c/autos.vim
@@ -1,3 +1,3 @@
-setlocal equalprg=clang-format60
+setlocal equalprg=cfmt.sh
 setlocal commentstring=//\ %s
 command! -buffer Fmt normal mtgg=G'tz.