clang-format can use ~/.clang-format

diff --git a/bin/bin/cfmt.sh b/bin/bin/cfmt.sh
deleted file mode 100755 (executable)
index 51585ca..0000000
--- a/bin/bin/cfmt.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-clang-format60 -style="{
-    BasedOnStyle: llvm,
-    ColumnLimit: 88,
-    IndentWidth: 4,
-    AllowAllParametersOfDeclarationOnNextLine: false,
-    AllowShortBlocksOnASingleLine: true,
-    AllowShortCaseLabelsOnASingleLine: true,
-    BinPackArguments: false,
-    BinPackParameters: false,
-    BreakStringLiterals: false,
-}" $@

diff --git a/clang-format/.clang-format b/clang-format/.clang-format
new file mode 100644 (file)
index 0000000..59c1b96
--- /dev/null
+++ b/clang-format/.clang-format
@@ -0,0 +1,10 @@
+BasedOnStyle: llvm
+ColumnLimit: 88
+IndentWidth: 4
+AlignConsecutiveAssignments: true
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: true
+AllowShortCaseLabelsOnASingleLine: true
+BinPackArguments: false
+BinPackParameters: false
+BreakStringLiterals: false

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