From 0d2f90825e271275b28e7e7ec713107cf20f8f1d Mon Sep 17 00:00:00 2001 From: Shidong Wang Date: Sat, 16 Oct 2021 23:39:05 +0800 Subject: [PATCH] fix(lang#c): fix `clang_std` option close https://github.com/SpaceVim/SpaceVim/issues/4335 --- autoload/SpaceVim/layers/lang/c.vim | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/autoload/SpaceVim/layers/lang/c.vim b/autoload/SpaceVim/layers/lang/c.vim index 30046e845..0f87b0e6e 100644 --- a/autoload/SpaceVim/layers/lang/c.vim +++ b/autoload/SpaceVim/layers/lang/c.vim @@ -345,9 +345,14 @@ endfunction " local function: update_checkers_argv {{{ if g:spacevim_lint_engine ==# 'neomake' function! s:update_checkers_argv(argv, fts) abort + if s:has_std(a:argv) + let default_std = 1 + else + let default_std = 0 + endif for ft in a:fts let g:neomake_{ft}_clang_maker = { - \ 'args': ['-fsyntax-only', '-Wall', '-Wextra', '-I./'] + a:argv, + \ 'args': ['-fsyntax-only', '-Wall', '-Wextra', '-I./'] + a:argv + (default_std ? [] : ['-std=' . s:clang_std[ft]]) + s:clang_flag, \ 'exe' : s:clang_executable, \ 'errorformat': \ '%-G%f:%s:,' .