]> git.notmuchmail.org Git - notmuch/blobdiff - vim/plugin/notmuch.vim
vim: have ? show details of what's under cursor in search/show views
[notmuch] / vim / plugin / notmuch.vim
index 18e6a59889823fe04ea2200ffab7bdd2baeee783..e13ea9f7fd1c3cc5e61ba52d4fe408c7dc4938d3 100644 (file)
 "
 " Authors: Bart Trojanowski <bart@jukie.net>
 
-" --- defaults
-
-if !exists('g:notmuch_cmd')
-        let g:notmuch_cmd = 'notmuch'
-endif
+" --- configuration defaults {{{1
+
+let s:notmuch_defaults = {
+        \ 'g:notmuch_cmd':                           'notmuch'                    ,
+        \
+        \ 'g:notmuch_search_newest_first':           1                            ,
+        \ 'g:notmuch_search_from_column_width':      20                           ,
+        \
+        \ 'g:notmuch_show_fold_signatures':          1                            ,
+        \ 'g:notmuch_show_fold_citations':           1                            ,
+        \ 'g:notmuch_show_fold_bodies':              0                            ,
+        \ 'g:notmuch_show_fold_headers':             1                            ,
+        \
+        \ 'g:notmuch_show_message_begin_regexp':     '^\fmessage{'                ,
+        \ 'g:notmuch_show_message_end_regexp':       '^\fmessage}'                ,
+        \ 'g:notmuch_show_header_begin_regexp':      '^\fheader{'                 ,
+        \ 'g:notmuch_show_header_end_regexp':        '^\fheader}'                 ,
+        \ 'g:notmuch_show_body_begin_regexp':        '^\fbody{'                   ,
+        \ 'g:notmuch_show_body_end_regexp':          '^\fbody}'                   ,
+        \ 'g:notmuch_show_attachment_begin_regexp':  '^\fattachment{'             ,
+        \ 'g:notmuch_show_attachment_end_regexp':    '^\fattachment}'             ,
+        \ 'g:notmuch_show_part_begin_regexp':        '^\fpart{'                   ,
+        \ 'g:notmuch_show_part_end_regexp':          '^\fpart}'                   ,
+        \ 'g:notmuch_show_marker_regexp':            '^\f\\(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 and tag:unread',
+        \ ]
+
+" defaults for g:notmuch_show_headers
+" override with: let g:notmuch_show_headers = [ ... ]
+let s:notmuch_show_headers_defaults = [
+        \ 'Subject',
+        \ 'To',
+        \ 'Cc',
+        \ 'Bcc',
+        \ 'Date',
+        \ ]
+
+" defaults for g:notmuch_folders
+" override with: let g:notmuch_folders = [ ... ]
+let s:notmuch_folders_defaults = [
+        \ [ 'new',    'tag:inbox and tag:unread' ],
+        \ [ 'inbox',  'tag:inbox'                ],
+        \ [ 'unread', 'tag:unread'               ],
+        \ ]
+
+" --- keyboard mapping definitions {{{1
+
+" --- --- bindings for folders mode {{{2
+
+let g:notmuch_folders_maps = {
+        \ 's':          ':call <SID>NM_search_prompt()<CR>',
+        \ 'q':          ':call <SID>NM_kill_this_buffer()<CR>',
+        \ '=':          ':call <SID>NM_folders_refresh_view()<CR>',
+        \ '<Enter>':    ':call <SID>NM_folders_show_search()<CR>',
+        \ }
+
+" --- --- bindings for search screen {{{2
+let g:notmuch_search_maps = {
+        \ '<Enter>':    ':call <SID>NM_search_show_thread()<CR>',
+        \ '<C-]>':      ':call <SID>NM_search_expand(''<cword>'')<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>',
+        \ 'q':          ':call <SID>NM_kill_this_buffer()<CR>',
+        \ '+':          ':call <SID>NM_search_add_tags([])<CR>',
+        \ '-':          ':call <SID>NM_search_remove_tags([])<CR>',
+        \ '=':          ':call <SID>NM_search_refresh_view()<CR>',
+        \ '?':          ':echo <SID>NM_search_thread_id()<CR>',
+        \ }
+
+" --- --- bindings for show screen {{{2
+let g:notmuch_show_maps = {
+        \ '<C-P>':      ':call <SID>NM_show_previous(1)<CR>',
+        \ '<C-N>':      ':call <SID>NM_show_next(1)<CR>',
+        \ '<C-]>':      ':call <SID>NM_search_expand(''<cword>'')<CR>',
+        \ 'q':          ':call <SID>NM_kill_this_buffer()<CR>',
+        \
+        \ 'b':          ':call <SID>NM_show_fold_toggle(''b'', ''bdy'', !g:notmuch_show_fold_bodies)<CR>',
+        \ 'c':          ':call <SID>NM_show_fold_toggle(''c'', ''cit'', !g:notmuch_show_fold_citations)<CR>',
+        \ 'h':          ':call <SID>NM_show_fold_toggle(''h'', ''hdr'', !g:notmuch_show_fold_headers)<CR>',
+        \ 's':          ':call <SID>NM_show_fold_toggle(''s'', ''sig'', !g:notmuch_show_fold_signatures)<CR>',
+        \
+        \ 'a':          ':call <SID>NM_show_archive_thread()<CR>',
+        \ 'A':          ':call <SID>NM_show_mark_read_then_archive_thread()<CR>',
+        \ 'N':          ':call <SID>NM_show_mark_read_then_next_open_message()<CR>',
+        \ 'v':          ':call <SID>NM_show_view_all_mime_parts()<CR>',
+        \ '+':          ':call <SID>NM_show_add_tag()<CR>',
+        \ '-':          ':call <SID>NM_show_remove_tag()<CR>',
+        \ '<Space>':    ':call <SID>NM_show_advance_marking_read_and_archiving()<CR>',
+        \ '\|':         ':call <SID>NM_show_pipe_message()<CR>',
+        \
+        \ 'r':          ':call <SID>NM_show_reply()<CR>',
+        \ 'm':          ':call <SID>NM_new_mail()<CR>',
+        \ '?':          ':echo <SID>NM_show_thread_id() . '' '' . <SID>NM_show_message_id()<CR>',
+        \ }
+
+
+" --- implement folders screen {{{1
+
+function! s:NM_cmd_folders(words)
+        if len(a:words)
+                echoe 'Not exapecting any arguments for folders command.'
+        endif
+        let cmd = ['count']
+        let disp = []
+        let searches = []
+        for entry in g:notmuch_folders
+                let [ name, search ] = entry
+                let data = s:NM_run(cmd + [search])
+                let cnt = matchlist(data, '\(\d\+\)')[1]
+                call add(disp, printf('%9d %-20s (%s)', cnt, name, search))
+                call add(searches, search)
+        endfor
 
-if !exists('g:notmuch_search_reverse')
-        let g:notmuch_search_reverse = 1
-endif
+        call <SID>NM_newBuffer('folders', join(disp, "\n"))
+        let b:nm_searches = searches
+        let b:nm_timestamp = reltime()
 
-" --- used to match output of notmuch
+        call <SID>NM_cmd_folders_mksyntax()
+        call <SID>NM_set_map(g:notmuch_folders_maps)
+        setlocal cursorline
+        setlocal nowrap
+endfunction
 
-let s:notmuch_show_message_begin_regexp    = '^\fmessage{'
-let s:notmuch_show_message_end_regexp      = '^\fmessage}'
-let s:notmuch_show_header_begin_regexp     = '^\fheader{'
-let s:notmuch_show_header_end_regexp       = '^\fheader}'
-let s:notmuch_show_body_begin_regexp       = '^\fbody{'
-let s:notmuch_show_body_end_regexp         = '^\fbody}'
-let s:notmuch_show_attachment_begin_regexp = '^\fattachment{'
-let s:notmuch_show_attachment_end_regexp   = '^\fattachment}'
-let s:notmuch_show_part_begin_regexp       = '^\fpart{'
-let s:notmuch_show_part_end_regexp         = '^\fpart}'
-let s:notmuch_show_marker_regexp           = '^\f\\(message\\|header\\|body\\|attachment\\|part\\)[{}].*$'
+function! s:NM_cmd_folders_mksyntax()
+endfunction
 
-let s:notmuch_show_message_parse_regexp    = '\(id:[^ ]*\) depth:\([0-9]*\) filename:\(.*\)$'
-let s:notmuch_show_tags_regexp             = '(\([^)]*\))$'
+" --- --- folders screen action functions {{{2
 
-let s:notmuch_show_signature_regexp        = '^\(-- \?\|_\+\)$'
-let s:notmuch_show_signature_lines_max     = 12
+function! s:NM_folders_refresh_view()
+        let lno = line('.')
+        setlocal bufhidden=delete
+        call s:NM_cmd_folders([])
+        exec printf('norm %dG', lno)
+endfunction
 
-let s:notmuch_show_citation_regexp         = '^\s*>'
+function! s:NM_folders_show_search()
+        let line = line('.')
+        let search = b:nm_searches[line-1]
 
-let s:notmuch_show_headers                 = [ 'Subject', 'From' ]
+        let prev_bufnr = bufnr('%')
+        setlocal bufhidden=hide
+        call <SID>NM_cmd_search([search])
+        setlocal bufhidden=delete
+        let b:nm_prev_bufnr = prev_bufnr
+endfunction
 
-let s:notmuch_show_fold_signatures         = 1
-let s:notmuch_show_fold_citations          = 1
 
-" --- implement search screen
+" --- 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 data = s:NM_run(cmd + a:words)
-        "let data = substitute(data, '27/27', '25/27', '')
-        "let data = substitute(data, '\[4/4\]', '[0/4]', '')
         let lines = split(data, "\n")
         let disp = copy(lines)
-        call map(disp, 'substitute(v:val, "^thread:\\S* ", "", "")' )
+        call map(disp, 's:NM_cmd_search_fmtline(v:val)')
 
-        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
 
-        nnoremap <buffer> <Enter> :call <SID>NM_search_display()<CR>
-        nnoremap <buffer> s       :call <SID>NM_cmd_search(split(input('NotMuch Search:')))<CR>
+        call <SID>NM_cmd_search_mksyntax()
+        call <SID>NM_set_map(g:notmuch_search_maps)
         setlocal cursorline
         setlocal nowrap
 endfunction
+function! s:NM_cmd_search_fmtline(line)
+        let m = matchlist(a:line, '^\(thread:\S\+\)\s\([^]]\+\]\) \([^;]\+\); \(.*\) (\([^(]*\))$')
+        if !len(m)
+                return 'ERROR PARSING: ' . a:line
+        endif
+        let max = g:notmuch_search_from_column_width
+        let from = m[3]
+        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])
+endfunction
+function! s:NM_cmd_search_mksyntax()
+        syntax clear nmSearchFrom
+        exec printf('syntax match nmSearchFrom /\(\] \)\@<=.\{%d\}/ oneline contained', g:notmuch_search_from_column_width)
+endfunction
+
+" --- --- search screen action functions {{{2
+
+function! s:NM_search_show_thread()
+        let id = <SID>NM_search_thread_id()
+        if id != ''
+                call <SID>NM_cmd_show([id])
+        endif
+endfunction
+
+function! s:NM_search_prompt()
+        " 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
+        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)
+        setlocal bufhidden=delete
+        let b:nm_prev_bufnr = prev_bufnr
+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()
+        call <SID>NM_add_remove_tags_on_screen('-', ['inbox'])
+        call <SID>NM_add_remove_tags('-', ['inbox'])
+        norm j
+endfunction
+
+function! s:NM_search_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:')
+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, 'and 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_search_toggle_order()
+        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_display()
+function! s:NM_search_reply_to_thread()
+        echo '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('.')
+        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
+
+" --- --- search screen helper functions {{{2
+
+function! s:NM_search_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)
+        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 <SID>NM_add_remove_tags(a:prefix, tags)
+        call <SID>NM_add_remove_tags_on_screen(a:prefix, tags)
+endfunction
 
-" --- implement show screen
+" --- implement show screen {{{1
 
 function! s:NM_cmd_show(words)
-        let bufnr = bufnr('%')
+        let prev_bufnr = bufnr('%')
         let data = s:NM_run(['show'] + a:words)
         let lines = split(data, "\n")
 
         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_words = a:words
         let b:nm_raw_info = info
+        let b:nm_prev_bufnr = prev_bufnr
 
-        call s:NM_cmd_show_mkfolds()
+        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=
-        setlocal foldcolumn=5
+        setlocal foldcolumn=6
+
+endfunction
+
+function! s:NM_show_previous(can_change_thread)
+        let info = b:nm_raw_info
+        let lnum = line('.')
+        for msg in reverse(copy(info['msgs']))
+                if lnum <= msg['start']
+                        continue
+                endif
+
+                exec printf('norm %dG', msg['start'])
+                " TODO: try to fit the message on screen
+                norm zz
+                return
+        endfor
+        if !a:can_change_thread
+                return
+        endif
+        call <SID>NM_kill_this_buffer()
+        if line('.') != line('0')
+                norm k
+                call <SID>NM_search_show_thread()
+                norm G
+                call <SID>NM_show_previous(0)
+        else
+                echo 'No more messages.'
+        endif
+endfunction
+
+function! s:NM_show_next(can_change_thread)
+        let info = b:nm_raw_info
+        let lnum = line('.')
+        for msg in info['msgs']
+                if lnum >= msg['start']
+                        continue
+                endif
 
-        exec printf("nnoremap <buffer> q :b %d<CR>", bufnr)
+                exec printf('norm %dG', msg['start'])
+                " TODO: try to fit the message on screen
+                norm zz
+                return
+        endfor
+        if !a:can_change_thread
+                return
+        endif
+        call <SID>NM_kill_this_buffer()
+        if line('.') != line('$')
+                norm j
+                call <SID>NM_search_show_thread()
+        else
+                echo 'No more messages.'
+        endif
+endfunction
+
+function! s:NM_show_archive_thread()
+        echo 'not implemented'
+endfunction
+
+function! s:NM_show_mark_read_then_archive_thread()
+        echo 'not implemented'
 endfunction
 
+function! s:NM_show_next_message()
+        echo 'not implemented'
+endfunction
+
+function! s:NM_show_mark_read_then_next_open_message()
+        echo 'not implemented'
+endfunction
+
+function! s:NM_show_previous_message()
+        echo 'not implemented'
+endfunction
+
+function! s:NM_show_reply()
+        echo 'not implemented'
+endfunction
+
+function! s:NM_show_view_all_mime_parts()
+        echo 'not implemented'
+endfunction
+
+function! s:NM_show_view_raw_message()
+        echo 'not implemented'
+endfunction
+
+function! s:NM_show_add_tag()
+        echo 'not implemented'
+endfunction
+
+function! s:NM_show_remove_tag()
+        echo 'not implemented'
+endfunction
+
+function! s:NM_show_advance_marking_read_and_archiving()
+        echo 'not implemented'
+endfunction
+
+function! s:NM_show_pipe_message()
+        echo 'not implemented'
+endfunction
+
+" --- --- show screen helper functions {{{2
+
+function! s:NM_show_thread_id()
+        if !exists('b:nm_words')
+                echoe 'no b:nm_words'
+                return ''
+        endif
+        return b:nm_words[0]
+endfunction
+
+function! s:NM_show_message_id()
+        if !exists('b:nm_raw_info')
+                echoe 'no b:nm_raw_info'
+                return ''
+        endif
+        let info = b:nm_raw_info
+        let lnum = line('.')
+        for msg in info['msgs']
+                if lnum < msg['start']
+                        continue
+                endif
+
+                return msg['id']
+        endfor
+        return ''
+endfunction
+
+function! s:NM_show_fold_toggle(key, type, fold)
+        let info = b:nm_raw_info
+        let act = 'open'
+        if a:fold
+                let act = 'close'
+        endif
+        for fld in info['folds']
+                if fld[0] == a:type
+                        exec printf('%dfold%s', fld[1], act)
+                endif
+        endfor
+        exec printf('nnoremap <buffer> %s :call <SID>NM_show_fold_toggle(''%s'', ''%s'', %d)<CR>', a:key, a:key, a:type, !a:fold)
+endfunction
+
+
 " s:NM_cmd_show_parse returns the following dictionary:
 "    'disp':     lines to display
 "    'msgs':     message info dicts { start, end, id, depth, filename, descr, header }
@@ -128,9 +536,10 @@ function! s:NM_cmd_show_parse(inlines)
         let in_message = 0
         let in_header = 0
         let in_body = 0
-        let in_part = 0
+        let in_part = ''
 
         let body_start = -1
+        let part_start = -1
 
         let mode_type = ''
         let mode_start = -1
@@ -140,58 +549,77 @@ function! s:NM_cmd_show_parse(inlines)
                 let inlnum = inlnum + 1
                 let foldinfo = []
 
-                if in_part
-                        if match(line, s:notmuch_show_part_end_regexp) != -1
-                                call add(info['disp'], '')
-                                let in_part = 0
+                if strlen(in_part)
+                        let part_end = 0
+
+                        if match(line, g:notmuch_show_part_end_regexp) != -1
+                                let part_end = len(info['disp'])
                         else
                                 call add(info['disp'], line)
-                        end
-
-                        if in_part && mode_type == ''
-                                if match(line, s:notmuch_show_signature_regexp) != -1
-                                        let mode_type = 'sig'
-                                        let mode_start = len(info['disp'])
-                                        "echoe 'TYPE: ' . mode_type . ' @' . mode_start
-                                elseif match(line, s:notmuch_show_citation_regexp) != -1
-                                        let mode_type = 'cit'
-                                        let mode_start = len(info['disp'])
-                                        "echoe 'TYPE: ' . mode_type . ' @' . mode_start
-                                endif
-                        elseif mode_type == 'cit'
-                                if !in_part || match(line, s:notmuch_show_citation_regexp) == -1
+                        endif
+
+                        if in_part == 'text/plain'
+                                if !part_end && mode_type == ''
+                                        if match(line, g:notmuch_show_signature_regexp) != -1
+                                                let mode_type = 'sig'
+                                                let mode_start = len(info['disp'])
+                                        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, g:notmuch_show_citation_regexp) == -1
+                                                let outlnum = len(info['disp'])
+                                                let foldinfo = [ mode_type, mode_start, outlnum-1,
+                                                               \ printf('[ %d-line citation.  Press "c" to show. ]', outlnum - mode_start) ]
+                                                let mode_type = ''
+                                        endif
+                                elseif mode_type == 'sig'
                                         let outlnum = len(info['disp'])
-                                        let foldinfo = [ mode_type, mode_start, outlnum,
-                                                       \ printf('[ %d-line citation.  Press "c" to show. ]', outlnum - mode_start) ]
-                                        let mode_type = ''
+                                        if (outlnum - mode_start) > g:notmuch_show_signature_lines_max
+                                                let mode_type = ''
+                                        elseif part_end
+                                                let foldinfo = [ mode_type, mode_start, outlnum-1,
+                                                               \ printf('[ %d-line signature.  Press "s" to show. ]', outlnum - mode_start) ]
+                                                let mode_type = ''
+                                        endif
                                 endif
-                        elseif mode_type == 'sig'
-                                let outlnum = len(info['disp'])
-                                if (outlnum - mode_start) > s:notmuch_show_signature_lines_max
-                                        let mode_type = ''
-                                elseif !in_part
-                                        let outlnum = outlnum - 1
-                                        let foldinfo = [ mode_type, mode_start, outlnum,
-                                                       \ printf('[ %d-line signature.  Press "s" to show. ]', outlnum - mode_start) ]
-                                        let mode_type = ''
+                        endif
+
+                        if part_end
+                                " FIXME: this is a hack for handling two folds being added for one line
+                                "         we should handle addinga fold in a function
+                                if len(foldinfo) && foldinfo[1] < foldinfo[2]
+                                        call add(info['folds'], foldinfo[0:2])
+                                        let info['foldtext'][foldinfo[1]] = foldinfo[3]
                                 endif
+
+                                let foldinfo = [ 'text', part_start, part_end,
+                                               \ printf('[ %d-line %s.  Press "p" to show. ]', part_end - part_start, in_part) ]
+                                let in_part = ''
+                                call add(info['disp'], '')
                         endif
 
                 elseif in_body
-                        if match(line, s:notmuch_show_body_end_regexp) != -1
+                        if !has_key(msg,'body_start')
+                                let msg['body_start'] = len(info['disp']) + 1
+                        endif
+                        if match(line, g:notmuch_show_body_end_regexp) != -1
                                 let body_end = len(info['disp'])
-                                let foldinfo = [ 'body', body_start, body_end,
+                                let foldinfo = [ 'bdy', 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
-                                let in_part = 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)
-                                        call add(info['disp'],
-                                                 \ printf('--- part %d --- %s ---', m[1], m[2]))
+                                        let in_part = m[2]
                                 endif
+                                call add(info['disp'],
+                                         \ printf('--- %s ---', in_part))
+                                let part_start = len(info['disp']) + 1
                         endif
 
                 elseif in_header
@@ -199,9 +627,14 @@ function! s:NM_cmd_show_parse(inlines)
                                 let msg['descr'] = line
                                 call add(info['disp'], line)
                                 let in_header = 2
+                                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 hdr_start = msg['hdr_start']+1
+                                        let hdr_end = len(info['disp'])
+                                        let foldinfo = [ 'hdr', hdr_start, hdr_end,
+                                               \ printf('[ %d-line headers.  Press "h" to show. ]', hdr_end + 1 - hdr_start) ]
                                         let msg['header'] = hdr
                                         let in_header = 0
                                         let hdr = {}
@@ -209,7 +642,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
@@ -217,11 +650,11 @@ 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'], '')
 
-                                let foldinfo = [ 'match', msg['start'], msg['end'],
+                                let foldinfo = [ 'msg', msg['start'], msg['end'],
                                                \ printf('[ MSG %d - %s ]', len(info['msgs']), msg['descr']) ]
 
                                 call add(info['msgs'], msg)
@@ -229,23 +662,23 @@ function! s:NM_cmd_show_parse(inlines)
                                 let in_message = 0
                                 let in_header = 0
                                 let in_body = 0
-                                let in_part = 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]
@@ -256,7 +689,7 @@ function! s:NM_cmd_show_parse(inlines)
                         endif
                 endif
 
-                if len(foldinfo)
+                if len(foldinfo) && foldinfo[1] < foldinfo[2]
                         call add(info['folds'], foldinfo[0:2])
                         let info['foldtext'][foldinfo[1]] = foldinfo[3]
                 endif
@@ -269,8 +702,10 @@ function! s:NM_cmd_show_mkfolds()
 
         for afold in info['folds']
                 exec printf('%d,%dfold', afold[1], afold[2])
-                if (afold[0] == 'sig' && s:notmuch_show_fold_signatures)
-                 \ || (afold[0] == 'cit' && s:notmuch_show_fold_citations)
+                if (afold[0] == 'sig' && g:notmuch_show_fold_signatures)
+                 \ || (afold[0] == 'cit' && g:notmuch_show_fold_citations)
+                 \ || (afold[0] == 'bdy' && g:notmuch_show_fold_bodies)
+                 \ || (afold[0] == 'hdr' && g:notmuch_show_fold_headers)
                         exec printf('%dfoldclose', afold[1])
                 else
                         exec printf('%dfoldopen', afold[1])
@@ -278,28 +713,51 @@ function! s:NM_cmd_show_mkfolds()
         endfor
 endfunction
 
+function! s:NM_cmd_show_mksyntax()
+        let info = b:nm_raw_info
+        let cnt = 0
+        for msg in info['msgs']
+                let cnt = cnt + 1
+                let start = msg['start']
+                let hdr_start = msg['hdr_start']
+                let body_start = msg['body_start']
+                let end = msg['end']
+                exec printf('syntax region nmShowMsg%dDesc start=''\%%%dl'' end=''\%%%dl'' contains=@nmShowMsgDesc', cnt, start, start+1)
+                exec printf('syntax region nmShowMsg%dHead start=''\%%%dl'' end=''\%%%dl'' contains=@nmShowMsgHead', cnt, hdr_start, body_start)
+                exec printf('syntax region nmShowMsg%dBody start=''\%%%dl'' end=''\%%%dl'' contains=@nmShowMsgBody', cnt, body_start, end)
+        endfor
+endfunction
+
 function! NM_cmd_show_foldtext()
         let foldtext = b:nm_raw_info['foldtext']
         return foldtext[v:foldstart]
 endfunction
 
 
-" --- helper functions
+" --- notmuch helper functions {{{1
 
-function! s:NM_newBuffer(ft, content)
+function! s:NM_newBuffer(type, content)
         enew
         setlocal buftype=nofile readonly modifiable
         silent put=a:content
         keepjumps 0d
         setlocal nomodifiable
-        execute printf('set filetype=notmuch-%s', a:ft)
-        execute printf('set syntax=notmuch-%s', a:ft)
+        execute printf('set filetype=notmuch-%s', a:type)
+        execute printf('set syntax=notmuch-%s', a:type)
+        let b:nm_type = a:type
 endfunction
 
 function! s:NM_run(args)
         let cmd = g:notmuch_cmd . ' ' . join(a:args) . '< /dev/null'
+
+        let start = reltime()
         let out = system(cmd)
-        if v:shell_error
+        let err = v:shell_error
+        let delta = reltime(start)
+
+        echo printf('[%s] {%s} %s', reltimestr(delta), string(err), string(cmd))
+
+        if err
                 echohl Error
                 echo substitute(out, '\n*$', '', '')
                 echohl None
@@ -309,30 +767,138 @@ function! s:NM_run(args)
         endif
 endfunction
 
+" --- external mail handling helpers {{{1
+
+function! s:NM_new_mail()
+        echo 'not implemented'
+endfunction
+
+" --- other helpers {{{1
+
+function! s:NM_kill_this_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_search_expand(arg)
+        let word = expand(a:arg)
+        let prev_bufnr = bufnr('%')
+        setlocal bufhidden=hide
+        call <SID>NM_cmd_search([word])
+        setlocal bufhidden=delete
+        let b:nm_prev_bufnr = prev_bufnr
+endfunction
+
+function! s:NM_add_remove_tags(prefix, tags)
+        let id = <SID>NM_search_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
+
+function! s:NM_add_remove_tags_on_screen(prefix, tags)
+        let online = ''
+        setlocal modifiable
+        if a:prefix == '-'
+                for tagname in a:tags
+                        exec printf('silent %ss/(\([^)]*\)\<%s\>\([^)]*\))$/(\1\2)/', online, tagname)
+                endfor
+        else
+                for tagname in a:tags
+                        exec printf('silent %ss/(\([^)]*\)\([^)]*\))$/(\1 %s)/', online, tagname)
+                endfor
+        endif
+        setlocal nomodifiable
+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)
+                " FIXME: not sure why this didn't work when dflt is an array
+                "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)
 
-" --- command handler
+" 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
+if !exists('g:notmuch_folders')
+        let g:notmuch_folders = s:notmuch_folders_defaults
+endif
+
+
+" --- assign keymaps {{{1
+
+function! s:NM_set_map(maps)
+        nmapclear
+        for [key, code] in items(a:maps)
+                exec printf('nnoremap <buffer> %s %s', key, code)
+        endfor
+        " --- this is a hack for development :)
+        nnoremap ,nmr :source ~/.vim/plugin/notmuch.vim<CR>:call NotMuch('')<CR>
+endfunction
+
+" --- command handler {{{1
 
 function! NotMuch(args)
-        if !strlen(a:args)
-                call s:NM_cmd_search(['tag:inbox'])
-                return
+        let args = a:args
+        if !strlen(args)
+                let args = 'folders'
         endif
 
-        echo "blarg!"
+        let words = split(args)
+        if words[0] == 'folders'
+                let words = words[1:]
+                call <SID>NM_cmd_folders(words)
+        elseif words[0] == 'search'
+                if len(words) > 1
+                        let words = words[1:]
+                elseif 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)
 
-        let words = split(a:args)
-        " TODO: handle commands passed as arguments
+        elseif words[0] == 'show'
+                echoe 'show is not yet implemented.'
+        endif
 endfunction
 function! CompleteNotMuch(arg_lead, cmd_line, cursor_pos)
         return []
 endfunction
 
 
-" --- glue
+" --- glue {{{1
 
 command! -nargs=* -complete=customlist,CompleteNotMuch NotMuch call NotMuch(<q-args>)
 cabbrev  notmuch <c-r>=(getcmdtype()==':' && getcmdpos()==1 ? 'NotMuch' : 'notmuch')<CR>
 
-" --- hacks, only for development :)
-
-nnoremap ,nmr :source ~/.vim/plugin/notmuch.vim<CR>:call NotMuch('')<CR>
+" vim: set ft=vim ts=8 sw=8 et foldmethod=marker :