From: Bart Trojanowski <bart@jukie.net>
Date: Tue, 24 Nov 2009 01:23:41 +0000 (-0500)
Subject: vim: fix shell escaping for () in search terms
X-Git-Tag: 0.1~313^2~49
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=845732464cced1d798fdf480e34b7bdf471b491a;hp=f275f5f7f0fd919b3f5a531ceb379006b740ee12

vim: fix shell escaping for () in search terms
---

diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim
index 0681c124..47bb4caf 100644
--- a/vim/plugin/notmuch.vim
+++ b/vim/plugin/notmuch.vim
@@ -296,7 +296,7 @@ function! s:NM_search_filter_helper(prompt, prefix, joiner)
                         let idx = idx - 1
                 endwhile
         endif
-        let tags = b:nm_search_words + ['and', '''('] + tags + [')''']
+        let tags = b:nm_search_words + ['and', '('] + tags + [')']
 
         let prev_bufnr = bufnr('%')
         setlocal bufhidden=hide
@@ -757,8 +757,15 @@ function! s:NM_newBuffer(type, content)
         let b:nm_type = a:type
 endfunction
 
+function! s:NM_shell_escape(word)
+        let word = substitute(a:word, '''', '\\''', 'g')
+        return '''' . word . ''''
+endfunction
+
 function! s:NM_run(args)
-        let cmd = g:notmuch_cmd . ' ' . join(a:args) . '< /dev/null'
+        let words = a:args
+        call map(words, 's:NM_shell_escape(v:val)')
+        let cmd = g:notmuch_cmd . ' ' . join(words) . '< /dev/null'
 
         let start = reltime()
         let out = system(cmd)