X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=vim%2Fplugin%2Fnotmuch.vim;h=47bb4caf06e62312235c92262d9ada8149ddedce;hp=e9370990e3eb4e03d0a487e28e2b4a345c136853;hb=845732464cced1d798fdf480e34b7bdf471b491a;hpb=384037285fa268cc75eedb0dc81e1781f4d45806

diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim
index e9370990..47bb4caf 100644
--- a/vim/plugin/notmuch.vim
+++ b/vim/plugin/notmuch.vim
@@ -218,7 +218,7 @@ function! s:NM_cmd_search_fmtline(line)
         if strlen(from) >= max
                 let from = substitute(m[3][0:max-4], '[^A-Za-z1-9_]*$', '', '') . '...'
         endif
-        return printf('%s %-20s | %s (%s)', m[2], from, m[4], m[5])
+        return printf('%-20s %-20s | %s (%s)', m[2], from, m[4], m[5])
 endfunction
 function! s:NM_cmd_search_mksyntax()
         syntax clear nmSearchFrom
@@ -271,14 +271,14 @@ function! s:NM_search_archive_thread()
 endfunction
 
 function! s:NM_search_filter()
-        call <SID>NM_search_filter_helper('Filter: ', '')
+        call <SID>NM_search_filter_helper('Filter: ', '', '')
 endfunction
 
 function! s:NM_search_filter_by_tag()
-        call <SID>NM_search_filter_helper('Filter Tag(s): ', 'tag:')
+        call <SID>NM_search_filter_helper('Filter Tag(s): ', 'tag:', 'and')
 endfunction
 
-function! s:NM_search_filter_helper(prompt, prefix)
+function! s:NM_search_filter_helper(prompt, prefix, joiner)
         " TODO: input() can support completion
         let text = input(a:prompt)
         if !strlen(text)
@@ -286,8 +286,17 @@ function! s:NM_search_filter_helper(prompt, prefix)
         endif
 
         let tags = split(text)
-        map(tags, 'and a:prefix . v:val')
-        let tags = b:nm_search_words + tags
+        if strlen(a:prefix)
+                call map(tags, 'a:prefix . v:val')
+        endif
+        if strlen(a:joiner)
+                let idx = len(tags) - 1
+                while idx > 0
+                        call insert(tags, a:joiner, idx)
+                        let idx = idx - 1
+                endwhile
+        endif
+        let tags = b:nm_search_words + ['and', '('] + tags + [')']
 
         let prev_bufnr = bufnr('%')
         setlocal bufhidden=hide
@@ -317,8 +326,10 @@ endfunction
 
 function! s:NM_search_refresh_view()
         let lno = line('.')
+        let prev_bufnr = b:nm_prev_bufnr
         setlocal bufhidden=delete
         call <SID>NM_cmd_search(b:nm_search_words)
+        let b:nm_prev_bufnr = prev_bufnr
         " FIXME: should find the line of the thread we were on if possible
         exec printf('norm %dG', lno)
 endfunction
@@ -746,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)