]> git.notmuchmail.org Git - notmuch/blobdiff - vim/plugin/notmuch.vim
make control-p go to previous message
[notmuch] / vim / plugin / notmuch.vim
index dab5335936c06a08e04146b911cc3cf4e3ef48ca..2ddc8160417b5552e77274c057d8819474e658e6 100644 (file)
@@ -29,6 +29,8 @@ let s:notmuch_defaults = {
         \
         \ '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}'                ,
@@ -54,14 +56,17 @@ let s:notmuch_defaults = {
 " defaults for g:notmuch_initial_search_words
 " override with: let g:notmuch_initial_search_words = [ ... ]
 let s:notmuch_initial_search_words_defaults = [
-        \ 'tag:inbox'
+        \ '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',
-        \ 'From'
+        \ 'To',
+        \ 'Cc',
+        \ 'Bcc',
+        \ 'Date',
         \ ]
 
 " --- keyboard mapping definitions {{{1
@@ -77,7 +82,7 @@ let g:notmuch_search_maps = {
         \ '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_buffer()<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>',
@@ -85,12 +90,29 @@ let g:notmuch_search_maps = {
 
 " --- --- bindings for show screen {{{2
 let g:notmuch_show_maps = {
-        \ '<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>',
+        \ '<C-P>':      ':call <SID>NM_show_prev(1)<CR>',
+        \ '<C-N>':      ':call <SID>NM_show_next(1)<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>',
         \ }
 
+
 " --- implement search screen {{{1
 
 function! s:NM_cmd_search(words)
@@ -202,10 +224,6 @@ function! s:NM_search_filter_helper(prompt, prefix)
         let b:nm_prev_bufnr = prev_bufnr
 endfunction
 
-function! s:NM_new_mail()
-        echoe 'Not implemented'
-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
@@ -214,7 +232,7 @@ function! s:NM_search_toggle_order()
 endfunction
 
 function! s:NM_search_reply_to_thread()
-        echoe 'Not implemented'
+        echo 'not implemented'
 endfunction
 
 function! s:NM_search_add_tags(tags)
@@ -295,34 +313,109 @@ function! s:NM_cmd_show(words)
 
 endfunction
 
-function! s:NM_kill_buffer()
-        if exists('b:nm_prev_bufnr')
-                setlocal bufhidden=delete
-                exec printf(":buffer %d", b:nm_prev_bufnr)
+function! s:NM_show_prev(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_prev(0)
         else
-                echo "Nothing to kill."
+                echo 'No more messages.'
         endif
 endfunction
 
-function! s:NM_cmd_show_next()
+function! s:NM_show_next(can_change_thread)
         let info = b:nm_raw_info
         let lnum = line('.')
-        let cnt = 0
         for msg in info['msgs']
-                let cnt = cnt + 1
                 if lnum >= msg['start']
                         continue
                 endif
 
                 exec printf('norm %dG', msg['start'])
+                " TODO: try to fit the message on screen
                 norm zz
                 return
         endfor
-        norm qj
-        call <SID>NM_search_show_thread()
+        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_cmd_show_fold_toggle(key, type, fold)
+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
+
+" --- --- search screen helper functions {{{2
+
+function! s:NM_show_fold_toggle(key, type, fold)
         let info = b:nm_raw_info
         let act = 'open'
         if a:fold
@@ -333,7 +426,7 @@ function! s:NM_cmd_show_fold_toggle(key, type, fold)
                         exec printf('%dfold%s', fld[1], act)
                 endif
         endfor
-        exec printf('nnoremap <buffer> %s :call <SID>NM_cmd_show_fold_toggle(''%s'', ''%s'', %d)<CR>', a:key, a:key, a:type, !a:fold)
+        exec printf('nnoremap <buffer> %s :call <SID>NM_show_fold_toggle(''%s'', ''%s'', %d)<CR>', a:key, a:key, a:type, !a:fold)
 endfunction
 
 
@@ -387,14 +480,13 @@ function! s:NM_cmd_show_parse(inlines)
                                 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,
+                                                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'])
                                         if (outlnum - mode_start) > g:notmuch_show_signature_lines_max
-                                                echoe 'line ' . outlnum . ' stopped matching'
                                                 let mode_type = ''
                                         elseif part_end
                                                 let foldinfo = [ mode_type, mode_start, outlnum,
@@ -424,7 +516,7 @@ function! s:NM_cmd_show_parse(inlines)
                         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
@@ -449,6 +541,10 @@ function! s:NM_cmd_show_parse(inlines)
 
                         else
                                 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 - hdr_start) ]
                                         let msg['header'] = hdr
                                         let in_header = 0
                                         let hdr = {}
@@ -468,7 +564,7 @@ function! s:NM_cmd_show_parse(inlines)
                                 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)
@@ -518,6 +614,8 @@ function! s:NM_cmd_show_mkfolds()
                 exec printf('%d,%dfold', afold[1], afold[2])
                 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])
@@ -571,6 +669,23 @@ 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
+
 " --- process and set the defaults {{{1
 
 function! NM_set_defaults(force)