Merge pull request #1236 from unikuragit/pr

Pr
Shougo · Apr 14, 2018 · 7252fc3 · 7252fc3
2 parents cc0af47 + 17a9de8
commit 7252fc3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/autoload/unite/sources/grep.vim b/autoload/unite/sources/grep.vim
@@ -254,7 +254,7 @@ endfunction"}}}
 
 function! unite#sources#grep#parse(line) abort "{{{
   let ret = matchlist(a:line,
-        \ '^\([a-zA-Z]\?[^:]*\):\(\d\+\)\%(:\(\d\+\)\)\?:\(.*\)$')
+        \ '^\(\%([a-zA-Z]:\)\?[^:]*\):\(\d\+\)\%(:\(\d\+\)\)\?:\(.*\)$')
   if empty(ret) || ret[1] == '' || ret[4] == ''
     return []
   endif

diff --git a/autoload/vital/_unite/System/File.vim b/autoload/vital/_unite/System/File.vim
@@ -138,6 +138,8 @@ elseif s:is_windows
       let src  = iconv(src, &encoding, 'char')
       let dest = iconv(dest, &encoding, 'char')
     endif
+    let src = '"'. src .'"'
+    let dest = '"'. dest .'"'
     let cmd_exe = (&shell =~? 'cmd\.exe$' ? '' : 'cmd /c ')
     call system(cmd_exe . 'move /y ' . src  . ' ' . dest)
     return !v:shell_error
@@ -272,6 +274,8 @@ elseif s:is_windows
     let [src, dest] = [a:src, a:dest]
     let src  = substitute(src, '/', '\', 'g')
     let dest = substitute(dest, '/', '\', 'g')
+    let src = '"'. src .'"'
+    let dest = '"'. dest .'"'
     let cmd_exe = (&shell =~? 'cmd\.exe$' ? '' : 'cmd /c ')
     call system(cmd_exe . 'copy /y ' . src . ' ' . dest)
     return !v:shell_error