On 4/16/20 9:57 AM, Richard Biener wrote:
Ah, tab vs. spaces. Changed to all spaces now and pushed.
Ah, I've also hit the issue. That's caused by our local vimrc.
We should exclude tab options for .py files.
Ready for master?
Thanks,
Martin
>From dc6daf004127f57a7317e492e4a61d3a9848a15b Mon Sep 17 00:00:00 2001
From: Martin Liska <mli...@suse.cz>
Date: Thu, 16 Apr 2020 15:17:51 +0200
Subject: [PATCH] Do not modify tab options in vimrc for .py files.
contrib/ChangeLog:
2020-04-16 Martin Liska <mli...@suse.cz>
* vimrc: We do not want to modify tab options
for Python files.
---
contrib/vimrc | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/contrib/vimrc b/contrib/vimrc
index bbbe1dd449b..fa0208d5beb 100644
--- a/contrib/vimrc
+++ b/contrib/vimrc
@@ -28,17 +28,19 @@
function! SetStyle()
let l:fname = expand("%:p")
+ let l:ext = fnamemodify(l:fname, ":e")
+ let l:c_exts = ['c', 'h', 'cpp', 'cc', 'C', 'H', 'def', 'java']
if stridx(l:fname, 'libsanitizer') != -1
return
endif
- setlocal tabstop=8
- setlocal softtabstop=2
- setlocal shiftwidth=2
- setlocal noexpandtab
+ if l:ext != "py"
+ setlocal tabstop=8
+ setlocal softtabstop=2
+ setlocal shiftwidth=2
+ setlocal noexpandtab
+ endif
setlocal textwidth=80
setlocal formatoptions-=ro formatoptions+=cqlt
- let l:ext = fnamemodify(l:fname, ":e")
- let l:c_exts = ['c', 'h', 'cpp', 'cc', 'C', 'H', 'def', 'java']
if index(l:c_exts, l:ext) != -1
setlocal cindent
setlocal cinoptions=>4,n-2,{2,^-2,:2,=2,g0,f0,h2,p4,t0,+2,(0,u0,w1,m0
--
2.26.0
