From afbbe41355122722a9e6beb23055e2b63187fc1e Mon Sep 17 00:00:00 2001 From: rbong Date: Sat, 26 Oct 2024 11:41:46 -0400 Subject: [PATCH] Fix systemlist carriage return on Windows --- autoload/flog/shell.vim | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/autoload/flog/shell.vim b/autoload/flog/shell.vim index 689fba7..05a07a1 100644 --- a/autoload/flog/shell.vim +++ b/autoload/flog/shell.vim @@ -18,10 +18,18 @@ function! flog#shell#EscapeList(list) abort endfunction function! flog#shell#Systemlist(cmd) abort + let l:cmd = a:cmd if type(a:cmd) == v:t_list - return systemlist(join(a:cmd, ' ')) + let l:cmd = join(l:cmd, ' ') endif - return systemlist(a:cmd) + if has('win32') + let l:result = split(system(l:cmd), '\n\r\?', 1) + if empty(l:result[-1]) + return l:result[:-2] + endif + return l:result + endif + return systemlist(l:cmd) endfunction function! flog#shell#Run(cmd) abort