From e373a6ccef7cc2e907ca0b4889fc0fe360961566 Mon Sep 17 00:00:00 2001
From: Mario Konrad <mario.konrad@gmx.net>
Date: Sat, 25 Jun 2016 22:23:31 +0200
Subject: [PATCH] Dev: clang-format configuration compatibility with
 clang-format-3.7

---
 .clang-format | 3 ++-
 .vimrc.local  | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.clang-format b/.clang-format
index e01aab56..2793d220 100644
--- a/.clang-format
+++ b/.clang-format
@@ -22,5 +22,6 @@ PointerAlignment: Middle
 ColumnLimit: 96
 MaxEmptyLinesToKeep: 1
 AlignEscapedNewlinesLeft: true
-SortIncludes: false
+#AllowShortFunctionsOnASingleLine: Inline
+#SortIncludes: false
 
diff --git a/.vimrc.local b/.vimrc.local
index 1c41aabc..b12e8105 100644
--- a/.vimrc.local
+++ b/.vimrc.local
@@ -3,6 +3,11 @@
 "
 " This just my personal preference for normal day-to-day development of this project.
 
+" clang-format
+map <C-K> :pyf /usr/share/vim/addons/syntax/clang-format-3.7.py<CR>
+imap <C-K> <ESC>:pyf /usr/share/vim/addons/syntax/clang-format-3.7.py<CR>i
+map <leader>fm ggVG :pyf /usr/share/vim/addons/syntax/clang-format-3.7.py<CR>
+
 " grepping
 map <F4> :grep -Ernw --include=*.c* --include=*.h* <cword> src <Bar> cw<CR>
 
-- 
2.11.4.GIT