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
else
let tags = s:notmuch_initial_search_words_defaults
endif
+ let prev_bufnr = bufnr('%')
if b:nm_type == 'search'
" TODO: we intend to replace the current buffer,
" ... maybe we could just clear it
let prev_bufnr = b:nm_prev_bufnr
setlocal bufhidden=delete
else
- let prev_bufnr = bufnr('%')
setlocal bufhidden=hide
endif
call <SID>NM_cmd_search(tags)
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)
endif
let tags = split(text)
- map(tags, 'and a:prefix . v:val')
- let tags = b:nm_search_words + tags
- echo 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
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
let info = b:nm_raw_info
let lnum = line('.')
for msg in info['msgs']
- if lnum < msg['start']
+ if lnum >= msg['start']
continue
endif
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)
setlocal bufhidden=delete
exec printf(":buffer %d", b:nm_prev_bufnr)
else
- echo "Nothing to kill."
+ echo "This is the last buffer; use :q<CR> to quit."
endif
endfunction