Remove 'guioptions' workaround

This commit is contained in:
Tim Pope
2019-08-09 00:44:04 -04:00
parent 8227503714
commit bc3d36e559

View File

@@ -3246,11 +3246,6 @@ function! s:CommitSubcommand(line1, line2, range, bang, mods, args, ...) abort
let msgfile = fugitive#Find('.git/COMMIT_EDITMSG', dir) let msgfile = fugitive#Find('.git/COMMIT_EDITMSG', dir)
let outfile = tempname() let outfile = tempname()
try try
let guioptions = &guioptions
try
if &guioptions =~# '!'
setglobal guioptions-=!
endif
if s:winshell() if s:winshell()
let command = 'set GIT_EDITOR=false& ' let command = 'set GIT_EDITOR=false& '
else else
@@ -3278,9 +3273,6 @@ function! s:CommitSubcommand(line1, line2, range, bang, mods, args, ...) abort
let [error_string, exec_error] = s:TempCmd(outfile, command) let [error_string, exec_error] = s:TempCmd(outfile, command)
let errors = split(error_string, "\n") let errors = split(error_string, "\n")
endif endif
finally
let &guioptions = guioptions
endtry
if !has('gui_running') if !has('gui_running')
redraw! redraw!
endif endif