let s:notmuch_defaults = {
\ 'g:notmuch_cmd': 'notmuch' ,
- \ 'g:notmuch_search_reverse': 1 ,
+ \ 'g:notmuch_search_newest_first': 1 ,
\ 'g:notmuch_show_fold_signatures': 1 ,
\ 'g:notmuch_show_fold_citations': 1 ,
\
\ 'o': ':call <SID>NM_search_toggle_order()<CR>',
\ 'r': ':call <SID>NM_search_reply_to_thread()<CR>',
\ 's': ':call <SID>NM_search_prompt()<CR>',
+ \ 'S': ':call <SID>NM_search_edit()<CR>',
\ 't': ':call <SID>NM_search_filter_by_tag()<CR>',
- \ '+': ':call <SID>NM_search_add_tag()<CR>',
- \ '-': ':call <SID>NM_search_remove_tag()<CR>',
+ \ 'q': ':call <SID>NM_kill_buffer()<CR>',
+ \ '+': ':call <SID>NM_search_add_tags([])<CR>',
+ \ '-': ':call <SID>NM_search_remove_tags([])<CR>',
\ '=': ':call <SID>NM_search_refresh_view()<CR>',
\ }
" --- --- bindings for show screen {{{2
let g:notmuch_show_maps = {
- \ 'q': ':call <SID>NM_cmd_show_quit()<CR>',
- \ '<C-N>': ':call <SID>NM_cmd_show_next()<CR>',
- \ 'c': ':call <SID>NM_cmd_show_fold_toggle(''c'', ''cit'', !g:notmuch_show_fold_citations)<CR>',
- \ 's': ':call <SID>NM_cmd_show_fold_toggle(''s'', ''sig'', !g:notmuch_show_fold_signatures)<CR>',
+ \ '<C-N>': ':call <SID>NM_cmd_show_next()<CR>',
+ \ 'c': ':call <SID>NM_cmd_show_fold_toggle(''c'', ''cit'', !g:notmuch_show_fold_citations)<CR>',
+ \ 's': ':call <SID>NM_cmd_show_fold_toggle(''s'', ''sig'', !g:notmuch_show_fold_signatures)<CR>',
+ \ 'q': ':call <SID>NM_kill_buffer()<CR>',
\ }
" --- implement search screen {{{1
function! s:NM_cmd_search(words)
let cmd = ['search']
- if g:notmuch_search_reverse
- let cmd = cmd + ['--reverse']
+ if g:notmuch_search_newest_first
+ let cmd = cmd + ['--sort=newest-first']
+ else
+ let cmd = cmd + ['--sort=oldest-first']
endif
- let g:notmuch_current_search_words = a:words
let data = s:NM_run(cmd + a:words)
"let data = substitute(data, '27/27', '25/27', '')
"let data = substitute(data, '\[4/4\]', '[0/4]', '')
let disp = copy(lines)
call map(disp, 'substitute(v:val, "^thread:\\S* ", "", "")' )
- call s:NM_newBuffer('search', join(disp, "\n"))
+ call <SID>NM_newBuffer('search', join(disp, "\n"))
let b:nm_raw_lines = lines
+ let b:nm_search_words = a:words
call <SID>NM_set_map(g:notmuch_search_maps)
setlocal cursorline
setlocal nowrap
endfunction
+" --- --- search screen action functions {{{2
+
function! s:NM_search_show_thread()
- if !exists('b:nm_raw_lines')
- echo 'no b:nm_raw_lines'
- else
- let line = line('.')
- let info = b:nm_raw_lines[line-1]
- let what = split(info, '\s\+')[0]
- call s:NM_cmd_show([what])
+ let id = <SID>NM_search_find_thread_id()
+ if id != ''
+ call <SID>NM_cmd_show([id])
endif
endfunction
function! s:NM_search_prompt()
- let new_list = input('NotMuch Search: ', join(g:notmuch_current_search_words, ' '))
- call <SID>NM_cmd_search(split(new_list))
+ " TODO: input() can support completion
+ let text = input('NotMuch Search: ')
+ if strlen(text)
+ let tags = split(text)
+ else
+ let tags = s:notmuch_initial_search_words_defaults
+ endif
+ setlocal bufhidden=delete
+ call <SID>NM_cmd_search(tags)
+endfunction
+
+function! s:NM_search_edit()
+ " TODO: input() can support completion
+ let text = input('NotMuch Search: ', join(b:nm_search_words, ' '))
+ if strlen(text)
+ call <SID>NM_cmd_search(split(text))
+ endif
endfunction
function! s:NM_search_archive_thread()
- echoe 'Not implemented'
+ call <SID>NM_add_remove_tags('-', ['inbox'])
+ " TODO: this could be made better and more generic
+ setlocal modifiable
+ s/(\([^)]*\)\<inbox\>\([^)]*\))$/(\1\2)/
+ setlocal nomodifiable
+ norm j
endfunction
function! s:NM_search_filter()
- echoe 'Not implemented'
+ 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:')
+endfunction
+
+function! s:NM_search_filter_helper(prompt, prefix)
+ " TODO: input() can support completion
+ let text = input(a:prompt)
+ if !strlen(text)
+ return
+ endif
+
+ let tags = split(text)
+ map(tags, 'a:prefix . v:val')
+ let tags = b:nm_search_words + tags
+ echo tags
+
+ let prev_bufnr = bufnr('%')
+ setlocal bufhidden=hide
+ call <SID>NM_cmd_search(tags)
+ setlocal bufhidden=delete
+ let b:nm_prev_bufnr = prev_bufnr
endfunction
function! s:NM_new_mail()
endfunction
function! s:NM_search_toggle_order()
- echoe 'Not implemented'
+ let g:notmuch_search_newest_first = !g:notmuch_search_newest_first
+ " FIXME: maybe this would be better done w/o reading re-reading the lines
+ " reversing the b:nm_raw_lines and the buffer lines would be better
+ call <SID>NM_search_refresh_view()
endfunction
function! s:NM_search_reply_to_thread()
echoe 'Not implemented'
endfunction
-function! s:NM_search_filter_by_tag()
- echoe 'Not implemented'
+function! s:NM_search_add_tags(tags)
+ call <SID>NM_search_add_remove_tags('Add Tag(s): ', '+', a:tags)
endfunction
-function! s:NM_search_add_tag()
- echoe 'Not implemented'
+function! s:NM_search_remove_tags(tags)
+ call <SID>NM_search_add_remove_tags('Remove Tag(s): ', '-', a:tags)
endfunction
-function! s:NM_search_remove_tag()
- echoe 'Not implemented'
+function! s:NM_search_refresh_view()
+ let lno = line('.')
+ setlocal bufhidden=delete
+ call <SID>NM_cmd_search(b:nm_search_words)
+ " FIXME: should find the line of the thread we were on if possible
+ exec printf('norm %dG', lno)
endfunction
-function! s:NM_search_refresh_view()
- echoe 'Not implemented'
+" --- --- search screen helper functions {{{2
+
+function! s:NM_search_find_thread_id()
+ if !exists('b:nm_raw_lines')
+ echoe 'no b:nm_raw_lines'
+ return ''
+ else
+ let line = line('.')
+ let info = b:nm_raw_lines[line-1]
+ let what = split(info, '\s\+')[0]
+ return what
+ endif
+endfunction
+
+function! s:NM_search_add_remove_tags(prompt, prefix, intags)
+ if type(a:intags) != type([]) || len(a:intags) == 0
+ " TODO: input() can support completion
+ let text = input(a:prompt)
+ if !strlen(text)
+ return
+ endif
+ call <SID>NM_add_remove_tags(prefix, split(text, ' '))
+ else
+ call <SID>NM_add_remove_tags(prefix, a:intags)
+ endif
+ call <SID>NM_search_refresh_view()
endfunction
+function! s:NM_add_remove_tags(prefix, tags)
+ let id = <SID>NM_search_find_thread_id()
+ if id == ''
+ echoe 'Eeek! I couldn''t find the thead id!'
+ endif
+ call map(a:tags, 'a:prefix . v:val')
+ " TODO: handle errors
+ call <SID>NM_run(['tag'] + a:tags + ['--', id])
+endfunction
" --- implement show screen {{{1
let info = s:NM_cmd_show_parse(lines)
- call s:NM_newBuffer('show', join(info['disp'], "\n"))
+ setlocal bufhidden=hide
+ call <SID>NM_newBuffer('show', join(info['disp'], "\n"))
setlocal bufhidden=delete
let b:nm_raw_info = info
let b:nm_prev_bufnr = prev_bufnr
- call s:NM_cmd_show_mkfolds()
- call s:NM_cmd_show_mksyntax()
+ call <SID>NM_cmd_show_mkfolds()
+ call <SID>NM_cmd_show_mksyntax()
call <SID>NM_set_map(g:notmuch_show_maps)
setlocal foldtext=NM_cmd_show_foldtext()
setlocal fillchars=
endfunction
-function! s:NM_cmd_show_quit()
- exec printf(":buffer %d", b:nm_prev_bufnr)
+function! s:NM_kill_buffer()
+ if exists('b:nm_prev_bufnr')
+ setlocal bufhidden=delete
+ exec printf(":buffer %d", b:nm_prev_bufnr)
+ else
+ echo "Nothing to kill."
+ endif
endfunction
function! s:NM_cmd_show_next()
let g:notmuch_initial_search_words = s:notmuch_initial_search_words_defaults
endif
-" this is the default querry
-let g:notmuch_current_search_words = g:notmuch_initial_search_words
-
" --- assign keymaps {{{1
function! NotMuch(args)
if !strlen(a:args)
- call s:NM_cmd_search(g:notmuch_current_search_words)
+ if exists('b:nm_search_words')
+ let words = b:nm_search_words
+ else
+ let words = g:notmuch_initial_search_words
+ endif
+ call <SID>NM_cmd_search(words)
return
endif
projects / notmuch / blobdiff