\ 'g:notmuch_show_citation_regexp': '^\s*>' ,
\ }
-" for some reason NM_set_defaults() didn't work for arrays...
-if !exists('g:notmuch_show_headers')
- let g:notmuch_show_headers = [ 'Subject', 'From' ]
-endif
+" defaults for g:notmuch_initial_search_words
+" override with: let g:notmuch_initial_search_words = [ ... ]
+let s:notmuch_initial_search_words_defaults = [
+ \ 'tag:inbox'
+ \ ]
+
+" defaults for g:notmuch_show_headers
+" override with: let g:notmuch_show_headers = [ ... ]
+let s:notmuch_show_headers_defaults = [
+ \ 'Subject',
+ \ 'From'
+ \ ]
" --- keyboard mapping definitions {{{1
+" --- --- bindings for search screen {{{2
let g:notmuch_search_maps = {
- \ '<Enter>': ':call <SID>NM_search_display()<CR>',
- \ 's': ':call <SID>NM_cmd_search(split(input(''NotMuch Search:'')))<CR>',
+ \ '<Enter>': ':call <SID>NM_search_show_thread()<CR>',
+ \ 'a': ':call <SID>NM_search_archive_thread()<CR>',
+ \ 'f': ':call <SID>NM_search_filter()<CR>',
+ \ 'm': ':call <SID>NM_new_mail()<CR>',
+ \ '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_tags([])<CR>',
+ \ '-': ':call <SID>NM_search_remove_tags([])<CR>',
+ \ '=': ':call <SID>NM_search_refresh_view()<CR>',
\ }
-" --- process and set the defaults {{{1
-
-function! NM_set_defaults(force)
- for [key, dflt] in items(s:notmuch_defaults)
- let cmd = ''
- if !a:force && exists(key) && type(dflt) == type(eval(key))
- continue
- elseif type(dflt) == type(0)
- let cmd = printf('let %s = %d', key, dflt)
- elseif type(dflt) == type('')
- let cmd = printf('let %s = ''%s''', key, dflt)
- "elseif type(dflt) == type([])
- " let cmd = printf('let %s = %s', key, string(dflt))
- else
- echoe printf('E: Unknown type in NM_set_defaults(%d) using [%s,%s]',
- \ a:force, key, string(dflt))
- continue
- endif
- echoe cmd
- exec cmd
- endfor
-endfunction
-call NM_set_defaults(0)
-
-" --- assign keymaps {{{1
-
-function! s:NM_set_map(maps)
- for [key, code] in items(a:maps)
- exec printf('nnoremap <buffer> %s %s', key, code)
- endfor
-endfunction
-
+" --- --- 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>',
+ \ }
" --- implement search screen {{{1
if g:notmuch_search_reverse
let cmd = cmd + ['--reverse']
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]', '')
setlocal nowrap
endfunction
-function! s:NM_search_display()
+" --- --- search screen action functions {{{2
+
+function! s:NM_search_show_thread()
+ let id = <SID>NM_search_find_thread_id()
+ if id != ''
+ call s:NM_cmd_show([id])
+ endif
+endfunction
+
+function! s:NM_search_prompt()
+ " TODO: input() can support completion
+ let text = input('NotMuch Search: ')
+ if strlen(text)
+ call <SID>NM_cmd_search(split(text))
+ endif
+endfunction
+
+function! s:NM_search_edit()
+ " TODO: input() can support completion
+ let text = input('NotMuch Search: ', join(g:notmuch_current_search_words, ' '))
+ if strlen(text)
+ call <SID>NM_cmd_search(split(text))
+ endif
+endfunction
+
+function! s:NM_search_archive_thread()
+ call <SID>NM_search_remove_tags('inbox')
+ norm j
+endfunction
+
+function! s:NM_search_filter()
+ echoe 'Not implemented'
+endfunction
+
+function! s:NM_new_mail()
+ echoe 'Not implemented'
+endfunction
+
+function! s:NM_search_toggle_order()
+ echoe 'Not implemented'
+endfunction
+
+function! s:NM_search_reply_to_thread()
+ echoe 'Not implemented'
+endfunction
+
+function! s:NM_search_filter_by_tag()
+ echoe 'Not implemented'
+endfunction
+
+function! s:NM_search_add_tags(tags)
+ call <SID>NM_search_add_remove_tags('Add Tag(s): ', '+', a:tags)
+endfunction
+
+function! s:NM_search_remove_tags(tags)
+ call <SID>NM_search_add_remove_tags('Remove Tag(s): ', '-', a:tags)
+endfunction
+
+function! s:NM_search_refresh_view()
+ let lno = line('.')
+ call s:NM_cmd_search(g:notmuch_current_search_words)
+ " FIXME: should find the line of the thread we were on if possible
+ exec printf('norm %dG', lno)
+endfunction
+
+" --- --- search screen helper functions {{{2
+
+function! s:NM_search_find_thread_id()
if !exists('b:nm_raw_lines')
- echo 'no 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]
- call s:NM_cmd_show([what])
+ return what
endif
endfunction
+function! s:NM_search_add_remove_tags(prompt, prefix, intags)
+ let id = <SID>NM_search_find_thread_id()
+ if id != ''
+ if type(a:intags) != type([]) || len(a:intags) == 0
+ " TODO: input() can support completion
+ let text = input(a:prompt)
+ if !strlen(text)
+ return
+ endif
+ let tags = split(text, ' ')
+ else
+ let tags = a:intags
+ endif
+ call map(tags, 'a:prefix . v:val')
+ " TODO: handle errors
+ call <SID>NM_run(['tag'] + tags + ['--', id])
+ call <SID>NM_search_refresh_view()
+ endif
+endfunction
" --- implement show screen {{{1
call s:NM_cmd_show_mkfolds()
call s:NM_cmd_show_mksyntax()
+ call <SID>NM_set_map(g:notmuch_show_maps)
setlocal foldtext=NM_cmd_show_foldtext()
setlocal fillchars=
setlocal foldcolumn=6
- exec printf("nnoremap <buffer> q :b %d<CR>", b:nm_prev_bufnr)
- nnoremap <buffer> <C-N> :call <SID>NM_cmd_show_next()<CR>
- nnoremap <buffer> c :call <SID>NM_cmd_show_fold_toggle('c', 'cit', !g:notmuch_show_fold_citations)<CR>
- nnoremap <buffer> s :call <SID>NM_cmd_show_fold_toggle('s', 'sig', !g:notmuch_show_fold_signatures)<CR>
+endfunction
+
+function! s:NM_cmd_show_quit()
+ exec printf(":buffer %d", b:nm_prev_bufnr)
endfunction
function! s:NM_cmd_show_next()
return
endfor
norm qj
- call <SID>NM_search_display()
+ call <SID>NM_search_show_thread()
endfunction
function! s:NM_cmd_show_fold_toggle(key, type, fold)
endfunction
-" --- helper functions {{{1
+" --- notmuch helper functions {{{1
function! s:NM_newBuffer(ft, content)
enew
endif
endfunction
+" --- process and set the defaults {{{1
+
+function! NM_set_defaults(force)
+ for [key, dflt] in items(s:notmuch_defaults)
+ let cmd = ''
+ if !a:force && exists(key) && type(dflt) == type(eval(key))
+ continue
+ elseif type(dflt) == type(0)
+ let cmd = printf('let %s = %d', key, dflt)
+ elseif type(dflt) == type('')
+ let cmd = printf('let %s = ''%s''', key, dflt)
+ "elseif type(dflt) == type([])
+ " let cmd = printf('let %s = %s', key, string(dflt))
+ else
+ echoe printf('E: Unknown type in NM_set_defaults(%d) using [%s,%s]',
+ \ a:force, key, string(dflt))
+ continue
+ endif
+ exec cmd
+ endfor
+endfunction
+call NM_set_defaults(0)
+
+" for some reason NM_set_defaults() didn't work for arrays...
+if !exists('g:notmuch_show_headers')
+ let g:notmuch_show_headers = s:notmuch_show_headers_defaults
+endif
+if !exists('g:notmuch_initial_search_words')
+ 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! s:NM_set_map(maps)
+ for [key, code] in items(a:maps)
+ exec printf('nnoremap <buffer> %s %s', key, code)
+ endfor
+endfunction
" --- command handler {{{1
function! NotMuch(args)
if !strlen(a:args)
- call s:NM_cmd_search(['tag:inbox'])
+ call s:NM_cmd_search(g:notmuch_current_search_words)
return
endif
projects / notmuch / blobdiff