diff --git a/nvim/after/ftplugin/awk.vim b/nvim/after/ftplugin/awk.vim deleted file mode 100644 index d7574a4..0000000 --- a/nvim/after/ftplugin/awk.vim +++ /dev/null @@ -1,4 +0,0 @@ -" -let &l:makeprg = 'awk --lint --source "BEGIN{exit(0)}END{exit(0)}" --file %:S' -" -let &l:errorformat = 'awk: %f:%l: %m' diff --git a/nvim/after/ftplugin/markdown.vim b/nvim/after/ftplugin/markdown.vim index 94e958b..f5408c0 100644 --- a/nvim/after/ftplugin/markdown.vim +++ b/nvim/after/ftplugin/markdown.vim @@ -1,5 +1,11 @@ source :h/text.vim -let &l:makeprg = 'markdown2htmldoc -- %:S %:S.html' +let s:src_file = expand('%') +let s:out_file = s:src_file.'.html' +let &l:makeprg = 'markdown2htmldoc' +for s:arg in get(g:, 'dotfiles_markdown2htmldoc_options', []) + let &l:makeprg .= ' '.shellescape(s:arg) +endfor +let &l:makeprg .= ' -- '.shellescape(s:src_file).' '.shellescape(s:out_file) nnoremap Open %.html diff --git a/nvim/after/ftplugin/scss.vim b/nvim/after/ftplugin/scss.vim index db198fe..9d5f7f1 100644 --- a/nvim/after/ftplugin/scss.vim +++ b/nvim/after/ftplugin/scss.vim @@ -1,3 +1,9 @@ source :h/css.vim -let &l:makeprg = 'sass -- %:S:%:S.css' +let s:src_file = expand('%') +let s:out_file = s:src_file.'.css' +let &l:makeprg = 'sass' +for s:arg in get(g:, 'dotfiles_dart_sass_options', []) + let &l:makeprg .= ' '.shellescape(s:arg) +endfor +let &l:makeprg .= ' -- '.shellescape(s:src_file).':'.shellescape(s:out_file) diff --git a/nvim/plugin/interface.vim b/nvim/plugin/interface.vim index 975c079..8e357ce 100644 --- a/nvim/plugin/interface.vim +++ b/nvim/plugin/interface.vim @@ -43,8 +43,7 @@ endif function s:CloseBuffer(cmd) abort let cmd = a:cmd if &modified - " - let answer = confirm("Save changes to \"".expand('%')."\"?", "&Yes\n&No\n&Cancel") + let answer = confirm("Save changes?", "&Yes\n&No\n&Cancel") if answer ==# 1 " Yes write elseif answer ==# 2 " No @@ -140,4 +139,4 @@ endif " }}} -nnoremap make! +nnoremap make