X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=vim%2Fplugin%2Fnotmuch.vim;h=b78a638236415f79619d0f1005da5bdaec11c1a8;hp=968b9aa61fd68330fb78ff54113bfb1de78fcf67;hb=7888bffce748ecfe0b49460bcda6033a4a74a66e;hpb=5a2d760067559b3fabf8718d189e815e7e6402da diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim index 968b9aa6..b78a6382 100644 --- a/vim/plugin/notmuch.vim +++ b/vim/plugin/notmuch.vim @@ -19,50 +19,82 @@ " " Authors: Bart Trojanowski -" --- defaults - -if !exists('g:notmuch_cmd') - let g:notmuch_cmd = 'notmuch' -endif - -if !exists('g:notmuch_search_reverse') - let g:notmuch_search_reverse = 1 -endif - -" --- used to match output of notmuch - -let s:notmuch_show_message_begin_regexp = '^ message{' -let s:notmuch_show_message_end_regexp = '^ message}' -let s:notmuch_show_header_begin_regexp = '^ header{' -let s:notmuch_show_header_end_regexp = '^ header}' -let s:notmuch_show_body_begin_regexp = '^ body{' -let s:notmuch_show_body_end_regexp = '^ body}' -let s:notmuch_show_attachment_begin_regexp = '^ attachment{' -let s:notmuch_show_attachment_end_regexp = '^ attachment}' -let s:notmuch_show_part_begin_regexp = '^ part{' -let s:notmuch_show_part_end_regexp = '^ part}' -let s:notmuch_show_marker_regexp = '^ \\(message\\|header\\|body\\|attachment\\|part\\)[{}].*$' - -let s:notmuch_show_message_parse_regexp = '\(id:[^ ]*\) depth:\([0-9]*\) filename:\(.*\)$' -let s:notmuch_show_tags_regexp = '(\([^)]*\))$' - -let s:notmuch_show_signature_regexp = '^\(-- \?\|_\+\)$' -let s:notmuch_show_signature_lines_max = 12 - -let s:notmuch_show_citation_regexp = '^\s*>' - -let s:notmuch_show_headers = [ 'Subject', 'From' ] - -let g:notmuch_show_fold_signatures = 1 -let g:notmuch_show_fold_citations = 1 - -" --- implement search screen +" --- configuration defaults {{{1 + +let s:notmuch_defaults = { + \ 'g:notmuch_cmd': 'notmuch' , + \ 'g:notmuch_search_reverse': 1 , + \ 'g:notmuch_show_fold_signatures': 1 , + \ 'g:notmuch_show_fold_citations': 1 , + \ + \ 'g:notmuch_show_message_begin_regexp': '^ message{' , + \ 'g:notmuch_show_message_end_regexp': '^ message}' , + \ 'g:notmuch_show_header_begin_regexp': '^ header{' , + \ 'g:notmuch_show_header_end_regexp': '^ header}' , + \ 'g:notmuch_show_body_begin_regexp': '^ body{' , + \ 'g:notmuch_show_body_end_regexp': '^ body}' , + \ 'g:notmuch_show_attachment_begin_regexp': '^ attachment{' , + \ 'g:notmuch_show_attachment_end_regexp': '^ attachment}' , + \ 'g:notmuch_show_part_begin_regexp': '^ part{' , + \ 'g:notmuch_show_part_end_regexp': '^ part}' , + \ 'g:notmuch_show_marker_regexp': '^ \\(message\\|header\\|body\\|attachment\\|part\\)[{}].*$', + \ + \ 'g:notmuch_show_message_parse_regexp': '\(id:[^ ]*\) depth:\([0-9]*\) filename:\(.*\)$', + \ 'g:notmuch_show_tags_regexp': '(\([^)]*\))$' , + \ + \ 'g:notmuch_show_signature_regexp': '^\(-- \?\|_\+\)$' , + \ 'g:notmuch_show_signature_lines_max': 12 , + \ + \ 'g:notmuch_show_citation_regexp': '^\s*>' , + \ } + +" 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 = { + \ '': ':call NM_search_show_thread()', + \ 'a': ':call NM_search_archive_thread()', + \ 'f': ':call NM_search_filter()', + \ 'm': ':call NM_new_mail()', + \ 'o': ':call NM_search_toggle_order()', + \ 'r': ':call NM_search_reply_to_thread()', + \ 's': ':call NM_search_prompt()', + \ 'S': ':call NM_search_edit()', + \ 't': ':call NM_search_filter_by_tag()', + \ '+': ':call NM_search_add_tags([])', + \ '-': ':call NM_search_remove_tags([])', + \ '=': ':call NM_search_refresh_view()', + \ } + +" --- --- bindings for show screen {{{2 +let g:notmuch_show_maps = { + \ 'q': ':call NM_cmd_show_quit()', + \ '': ':call NM_cmd_show_next()', + \ 'c': ':call NM_cmd_show_fold_toggle(''c'', ''cit'', !g:notmuch_show_fold_citations)', + \ 's': ':call NM_cmd_show_fold_toggle(''s'', ''sig'', !g:notmuch_show_fold_signatures)', + \ } + +" --- implement search screen {{{1 function! s:NM_cmd_search(words) let cmd = ['search'] 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]', '') @@ -73,25 +105,111 @@ function! s:NM_cmd_search(words) call s:NM_newBuffer('search', join(disp, "\n")) let b:nm_raw_lines = lines - nnoremap :call NM_search_display() - nnoremap s :call NM_cmd_search(split(input('NotMuch Search:'))) + call NM_set_map(g:notmuch_search_maps) setlocal cursorline setlocal nowrap endfunction -function! s:NM_search_display() +" --- --- search screen action functions {{{2 + +function! s:NM_search_show_thread() + let id = 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 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 NM_cmd_search(split(text)) + endif +endfunction + +function! s:NM_search_archive_thread() + call 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 NM_search_add_remove_tags('Add Tag(s): ', '+', a:tags) +endfunction + +function! s:NM_search_remove_tags(tags) + call 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 = 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 NM_run(['tag'] + tags + ['--', id]) + call NM_search_refresh_view() + endif +endfunction -" --- implement show screen +" --- implement show screen {{{1 function! s:NM_cmd_show(words) let prev_bufnr = bufnr('%') @@ -107,14 +225,15 @@ function! s:NM_cmd_show(words) call s:NM_cmd_show_mkfolds() call s:NM_cmd_show_mksyntax() + call NM_set_map(g:notmuch_show_maps) setlocal foldtext=NM_cmd_show_foldtext() setlocal fillchars= setlocal foldcolumn=6 - exec printf("nnoremap q :b %d", b:nm_prev_bufnr) - nnoremap :call NM_cmd_show_next() - nnoremap c :call NM_cmd_show_fold_toggle('c', 'cit', !g:notmuch_show_fold_citations) - nnoremap s :call NM_cmd_show_fold_toggle('s', 'sig', !g:notmuch_show_fold_signatures) +endfunction + +function! s:NM_cmd_show_quit() + exec printf(":buffer %d", b:nm_prev_bufnr) endfunction function! s:NM_cmd_show_next() @@ -132,7 +251,7 @@ function! s:NM_cmd_show_next() return endfor norm qj - call NM_search_display() + call NM_search_show_thread() endfunction function! s:NM_cmd_show_fold_toggle(key, type, fold) @@ -182,7 +301,7 @@ function! s:NM_cmd_show_parse(inlines) if strlen(in_part) let part_end = 0 - if match(line, s:notmuch_show_part_end_regexp) != -1 + if match(line, g:notmuch_show_part_end_regexp) != -1 let part_end = len(info['disp']) else call add(info['disp'], line) @@ -190,15 +309,15 @@ function! s:NM_cmd_show_parse(inlines) if in_part == 'text/plain' if !part_end && mode_type == '' - if match(line, s:notmuch_show_signature_regexp) != -1 + if match(line, g:notmuch_show_signature_regexp) != -1 let mode_type = 'sig' let mode_start = len(info['disp']) - elseif match(line, s:notmuch_show_citation_regexp) != -1 + elseif match(line, g:notmuch_show_citation_regexp) != -1 let mode_type = 'cit' let mode_start = len(info['disp']) endif elseif mode_type == 'cit' - if part_end || match(line, s:notmuch_show_citation_regexp) == -1 + if part_end || match(line, g:notmuch_show_citation_regexp) == -1 let outlnum = len(info['disp']) let foldinfo = [ mode_type, mode_start, outlnum, \ printf('[ %d-line citation. Press "c" to show. ]', outlnum - mode_start) ] @@ -206,7 +325,7 @@ function! s:NM_cmd_show_parse(inlines) endif elseif mode_type == 'sig' let outlnum = len(info['disp']) - if (outlnum - mode_start) > s:notmuch_show_signature_lines_max + if (outlnum - mode_start) > g:notmuch_show_signature_lines_max echoe 'line ' . outlnum . ' stopped matching' let mode_type = '' elseif part_end @@ -235,14 +354,14 @@ function! s:NM_cmd_show_parse(inlines) if !has_key(msg,'body_start') let msg['body_start'] = len(info['disp']) + 1 endif - if match(line, s:notmuch_show_body_end_regexp) != -1 + if match(line, g:notmuch_show_body_end_regexp) != -1 let body_end = len(info['disp']) let foldinfo = [ 'body', body_start, body_end, \ printf('[ BODY %d - %d lines ]', len(info['msgs']), body_end - body_start) ] let in_body = 0 - elseif match(line, s:notmuch_show_part_begin_regexp) != -1 + elseif match(line, g:notmuch_show_part_begin_regexp) != -1 let m = matchlist(line, 'ID: \(\d\+\), Content-type: \(\S\+\)') let in_part = 'unknown' if len(m) @@ -261,7 +380,7 @@ function! s:NM_cmd_show_parse(inlines) let msg['hdr_start'] = len(info['disp']) + 1 else - if match(line, s:notmuch_show_header_end_regexp) != -1 + if match(line, g:notmuch_show_header_end_regexp) != -1 let msg['header'] = hdr let in_header = 0 let hdr = {} @@ -269,7 +388,7 @@ function! s:NM_cmd_show_parse(inlines) let m = matchlist(line, '^\(\w\+\):\s*\(.*\)$') if len(m) let hdr[m[1]] = m[2] - if match(s:notmuch_show_headers, m[1]) != -1 + if match(g:notmuch_show_headers, m[1]) != -1 call add(info['disp'], line) endif endif @@ -277,7 +396,7 @@ function! s:NM_cmd_show_parse(inlines) endif elseif in_message - if match(line, s:notmuch_show_message_end_regexp) != -1 + if match(line, g:notmuch_show_message_end_regexp) != -1 let msg['end'] = len(info['disp']) call add(info['disp'], '') @@ -291,21 +410,21 @@ function! s:NM_cmd_show_parse(inlines) let in_body = 0 let in_part = '' - elseif match(line, s:notmuch_show_header_begin_regexp) != -1 + elseif match(line, g:notmuch_show_header_begin_regexp) != -1 let in_header = 1 continue - elseif match(line, s:notmuch_show_body_begin_regexp) != -1 + elseif match(line, g:notmuch_show_body_begin_regexp) != -1 let body_start = len(info['disp']) + 1 let in_body = 1 continue endif else - if match(line, s:notmuch_show_message_begin_regexp) != -1 + if match(line, g:notmuch_show_message_begin_regexp) != -1 let msg['start'] = len(info['disp']) + 1 - let m = matchlist(line, s:notmuch_show_message_parse_regexp) + let m = matchlist(line, g:notmuch_show_message_parse_regexp) if len(m) let msg['id'] = m[1] let msg['depth'] = m[2] @@ -359,7 +478,7 @@ function! NM_cmd_show_foldtext() endfunction -" --- helper functions +" --- notmuch helper functions {{{1 function! s:NM_newBuffer(ft, content) enew @@ -384,12 +503,54 @@ function! s:NM_run(args) endif endfunction +" --- process and set the defaults {{{1 -" --- command handler +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 %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 @@ -403,11 +564,13 @@ function! CompleteNotMuch(arg_lead, cmd_line, cursor_pos) endfunction -" --- glue +" --- glue {{{1 command! -nargs=* -complete=customlist,CompleteNotMuch NotMuch call NotMuch() cabbrev notmuch =(getcmdtype()==':' && getcmdpos()==1 ? 'NotMuch' : 'notmuch') -" --- hacks, only for development :) +" --- hacks, only for development :) {{{1 nnoremap ,nmr :source ~/.vim/plugin/notmuch.vim:call NotMuch('') + +" vim: set ft=vim ts=8 sw=8 et foldmethod=marker :