From e4f79f6e981dcf5d5e007f160a3d1e79f92469bf Mon Sep 17 00:00:00 2001 From: Junegunn Choi Date: Tue, 7 Mar 2017 23:17:04 +0900 Subject: [PATCH] Use shellescape instead of manual escaping Close #328 --- autoload/fzf/vim.vim | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/autoload/fzf/vim.vim b/autoload/fzf/vim.vim index 5b9a9ef..7ec7b92 100644 --- a/autoload/fzf/vim.vim +++ b/autoload/fzf/vim.vim @@ -110,10 +110,6 @@ function! s:escape(path) return escape(a:path, ' $%#''"\') endfunction -function! s:q1(str) - return "'".substitute(a:str, "'", "'\\\\''", 'g')."'" -endfunction - if v:version >= 704 function! s:function(name) return function(a:name) @@ -613,7 +609,7 @@ function! fzf#vim#ag(query, ...) let query = empty(a:query) ? '^(?=.)' : a:query let args = copy(a:000) let ag_opts = len(args) > 1 && type(args[0]) == s:TYPE.string ? remove(args, 0) : '' - let command = ag_opts . ' ' . s:q1(query) + let command = ag_opts . ' ' . shellescape(query) return call('fzf#vim#ag_raw', insert(args, command, 0)) endfunction @@ -695,7 +691,7 @@ function! s:btags_sink(lines) endfunction function! s:q(query) - return ' --query '.s:q1(a:query) + return ' --query '.shellescape(a:query) endfunction " query, [[tag commands], options]