aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/ChangeLog5
-rw-r--r--contrib/vimrc3
2 files changed, 8 insertions, 0 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 3dfd0e186f1..7068525a706 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+
+2017-01-05 Martin Liska <mliska@suse.cz>
+
+ * vimrc: Update indentation definition.
+
2017-01-04 Jakub Jelinek <jakub@redhat.com>
* update-copyright.py (GCCCmdLine): Add include, libcc1, libiberty,
diff --git a/contrib/vimrc b/contrib/vimrc
index 34e8f3543f9..7c0c5878c63 100644
--- a/contrib/vimrc
+++ b/contrib/vimrc
@@ -35,7 +35,10 @@ function! SetStyle()
let l:c_exts = ['c', 'h', 'cpp', 'cc', 'C', 'H', 'def', 'java']
if index(l:c_exts, l:ext) != -1
setlocal cindent
+ setlocal tabstop=8
setlocal softtabstop=2
+ setlocal shiftwidth=2
+ setlocal noexpandtab
setlocal cinoptions=>4,n-2,{2,^-2,:2,=2,g0,f0,h2,p4,t0,+2,(0,u0,w1,m0
setlocal textwidth=80
setlocal formatoptions-=ro formatoptions+=cqlt