debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-22 17:34:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

implemented folding bodies and headers

Browse source
This commit is contained in:
Bart Trojanowski 2009-11-20 14:18:42 -05:00
parent acb696165c
commit e2006a2f3c
2 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
vim/README
View file

@ -32,8 +32,10 @@ Buffer types:
This is the display of the message. This is the display of the message.
Keybindings: Keybindings:
q - return to search display
^n - next message ^n - next message
s - toggle folding of signatures on and off b - toggle folding of message bodies
c - toggle folding of citations on and off c - toggle folding of citations
h - toggle folding of extra header lines
s - toggle folding of signatures
q - return to search display

25
vim/plugin/notmuch.vim
View file

@ -29,6 +29,8 @@ let s:notmuch_defaults = {
\ \
\ 'g:notmuch_show_fold_signatures': 1 , \ 'g:notmuch_show_fold_signatures': 1 ,
\ 'g:notmuch_show_fold_citations': 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': '^ message{' , \ 'g:notmuch_show_message_begin_regexp': '^ message{' ,
\ 'g:notmuch_show_message_end_regexp': '^ message}' , \ 'g:notmuch_show_message_end_regexp': '^ message}' ,
@ -61,7 +63,10 @@ let s:notmuch_initial_search_words_defaults = [
" override with: let g:notmuch_show_headers = [ ... ] " override with: let g:notmuch_show_headers = [ ... ]
let s:notmuch_show_headers_defaults = [ let s:notmuch_show_headers_defaults = [
\ 'Subject', \ 'Subject',
\ 'From' \ 'To',
\ 'Cc',
\ 'Bcc',
\ 'Date'
\ ] \ ]
" --- keyboard mapping definitions {{{1 " --- keyboard mapping definitions {{{1
@ -85,8 +90,11 @@ let g:notmuch_search_maps = {
" --- --- bindings for show screen {{{2 " --- --- bindings for show screen {{{2
let g:notmuch_show_maps = { let g:notmuch_show_maps = {
\ '<C-P>': ':call <SID>NM_cmd_show_prev()<CR>',
\ '<C-N>': ':call <SID>NM_cmd_show_next()<CR>', \ '<C-N>': ':call <SID>NM_cmd_show_next()<CR>',
\ 'b': ':call <SID>NM_cmd_show_fold_toggle(''b'', ''bdy'', !g:notmuch_show_fold_bodies)<CR>',
\ 'c': ':call <SID>NM_cmd_show_fold_toggle(''c'', ''cit'', !g:notmuch_show_fold_citations)<CR>', \ 'c': ':call <SID>NM_cmd_show_fold_toggle(''c'', ''cit'', !g:notmuch_show_fold_citations)<CR>',
\ 'h': ':call <SID>NM_cmd_show_fold_toggle(''h'', ''hdr'', !g:notmuch_show_fold_headers)<CR>',
\ 's': ':call <SID>NM_cmd_show_fold_toggle(''s'', ''sig'', !g:notmuch_show_fold_signatures)<CR>', \ 's': ':call <SID>NM_cmd_show_fold_toggle(''s'', ''sig'', !g:notmuch_show_fold_signatures)<CR>',
\ 'q': ':call <SID>NM_kill_buffer()<CR>', \ 'q': ':call <SID>NM_kill_buffer()<CR>',
\ } \ }
@ -304,6 +312,10 @@ function! s:NM_kill_buffer()
endif endif
endfunction endfunction
function! s:NM_cmd_show_prev()
echoe "not implemented"
endfunction
function! s:NM_cmd_show_next() function! s:NM_cmd_show_next()
let info = b:nm_raw_info let info = b:nm_raw_info
let lnum = line('.') let lnum = line('.')
@ -394,7 +406,6 @@ function! s:NM_cmd_show_parse(inlines)
elseif mode_type == 'sig' elseif mode_type == 'sig'
let outlnum = len(info['disp']) let outlnum = len(info['disp'])
if (outlnum - mode_start) > g:notmuch_show_signature_lines_max if (outlnum - mode_start) > g:notmuch_show_signature_lines_max
echoe 'line ' . outlnum . ' stopped matching'
let mode_type = '' let mode_type = ''
elseif part_end elseif part_end
let foldinfo = [ mode_type, mode_start, outlnum, let foldinfo = [ mode_type, mode_start, outlnum,
@ -424,7 +435,7 @@ function! s:NM_cmd_show_parse(inlines)
endif endif
if match(line, g:notmuch_show_body_end_regexp) != -1 if match(line, g:notmuch_show_body_end_regexp) != -1
let body_end = len(info['disp']) 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) ] \ printf('[ BODY %d - %d lines ]', len(info['msgs']), body_end - body_start) ]
let in_body = 0 let in_body = 0
@ -449,6 +460,10 @@ function! s:NM_cmd_show_parse(inlines)
else else
if match(line, g: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 - hdr_start) ]
let msg['header'] = hdr let msg['header'] = hdr
let in_header = 0 let in_header = 0
let hdr = {} let hdr = {}
@ -468,7 +483,7 @@ function! s:NM_cmd_show_parse(inlines)
let msg['end'] = len(info['disp']) let msg['end'] = len(info['disp'])
call add(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']) ] \ printf('[ MSG %d - %s ]', len(info['msgs']), msg['descr']) ]
call add(info['msgs'], msg) call add(info['msgs'], msg)
@ -518,6 +533,8 @@ function! s:NM_cmd_show_mkfolds()
exec printf('%d,%dfold', afold[1], afold[2]) exec printf('%d,%dfold', afold[1], afold[2])
if (afold[0] == 'sig' && g:notmuch_show_fold_signatures) if (afold[0] == 'sig' && g:notmuch_show_fold_signatures)
\ || (afold[0] == 'cit' && g:notmuch_show_fold_citations) \ || (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]) exec printf('%dfoldclose', afold[1])
else else
exec printf('%dfoldopen', afold[1]) exec printf('%dfoldopen', afold[1])