let s:notmuch_defaults = {
\ 'g:notmuch_cmd': 'notmuch' ,
+ \ 'g:notmuch_debug': 0 ,
\
\ 'g:notmuch_search_newest_first': 1 ,
\ 'g:notmuch_search_from_column_width': 20 ,
\ '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_message_parse_regexp': '\(id:[^ ]*\) depth:\([0-9]*\) match:\([0-9]*\) filename:\(.*\)$',
\ 'g:notmuch_show_tags_regexp': '(\([^)]*\))$' ,
\
\ 'g:notmuch_show_signature_regexp': '^\(-- \?\|_\+\)$' ,
" --- --- 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-P>': ':call <SID>NM_show_previous(1, 0)<CR>',
+ \ '<C-N>': ':call <SID>NM_show_next(1, 0)<CR>',
\ '<C-]>': ':call <SID>NM_search_expand(''<cword>'')<CR>',
\ 'q': ':call <SID>NM_kill_this_buffer()<CR>',
\
endfunction
function! s:NM_search_archive_thread()
- call <SID>NM_add_remove_tags_on_screen('-', ['inbox'])
- call <SID>NM_add_remove_tags('-', ['inbox'])
+ call <SID>NM_add_remove_tags_on_screen('', '-', ['inbox'])
+ call <SID>NM_add_remove_tags([], '-', ['inbox'])
norm j
endfunction
if !exists('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]
- return what
endif
+ let mnum = line('.') - 1
+ if len(b:nm_raw_lines) <= mnum
+ return ''
+ endif
+ echo 'len=' . string(len(b:nm_raw_lines)) . ' mnum=' . string(mnum)
+ let info = b:nm_raw_lines[mnum]
+ let what = split(info, '\s\+')[0]
+ return what
endfunction
function! s:NM_search_add_remove_tags(prompt, prefix, intags)
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)
+ call <SID>NM_add_remove_tags([], a:prefix, tags)
+ call <SID>NM_add_remove_tags_on_screen('', a:prefix, tags)
endfunction
" --- implement show screen {{{1
endfunction
-function! s:NM_show_previous(can_change_thread)
+function! s:NM_show_previous(can_change_thread, find_matching)
let info = b:nm_raw_info
let lnum = line('.')
for msg in reverse(copy(info['msgs']))
+ if a:find_matching && msg['match'] == '0'
+ continue
+ endif
if lnum <= msg['start']
continue
endif
- exec printf('norm %dG', msg['start'])
+ exec printf('norm %dGzt', 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')
+ if line('.') > 1
norm k
call <SID>NM_search_show_thread()
norm G
- call <SID>NM_show_previous(0)
+ call <SID>NM_show_previous(0, a:find_matching)
else
echo 'No more messages.'
endif
endfunction
-function! s:NM_show_next(can_change_thread)
+function! s:NM_show_next(can_change_thread, find_matching)
let info = b:nm_raw_info
let lnum = line('.')
for msg in info['msgs']
+ if a:find_matching && msg['match'] == '0'
+ continue
+ endif
if lnum >= msg['start']
continue
endif
- exec printf('norm %dG', msg['start'])
+ exec printf('norm %dGzt', msg['start'])
" TODO: try to fit the message on screen
- norm zz
return
endfor
- if !a:can_change_thread
- return
+ if a:can_change_thread
+ call <SID>NM_show_next_thread()
endif
+endfunction
+
+function! s:NM_show_next_thread()
call <SID>NM_kill_this_buffer()
if line('.') != line('$')
norm j
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
echo 'not implemented'
endfunction
+" if entire message is not visible scroll down 1/2 page or less to get to the bottom of message
+" otherwise go to next message
+" any message that is viewed entirely has inbox and unread tags removed
function! s:NM_show_advance_marking_read_and_archiving()
- echo 'not implemented'
+ let advance_tags = ['unread', 'inbox']
+
+ let vis_top = line('w0')
+ let vis_bot = line('w$')
+
+ let msg_top = <SID>NM_show_get_message_for_line(vis_top)
+ if !has_key(msg_top,'id')
+ echo "No top visible message."
+ endif
+
+ " if the top message is the last message, just expunge the entire thread and move on
+ if msg_top['end'] == line('$')
+ let ids = []
+ for msg in b:nm_raw_info['msgs']
+ if has_key(msg,'match') && msg['match'] != '0'
+ if len(ids)
+ call add(ids, 'OR')
+ endif
+ call add(ids, msg['id'])
+ endif
+ endfor
+
+ let filter = ['('] + advance_tags + [')', 'AND', '('] + ids + [')']
+ call <SID>NM_add_remove_tags(filter, '-', advance_tags)
+ call <SID>NM_show_next(1, 1)
+ return
+ endif
+
+ let msg_bot = <SID>NM_show_get_message_for_line(vis_bot)
+ if !has_key(msg_bot,'id')
+ echo "No bottom visible message."
+ endif
+
+ " if entire message fits on the screen, read/archive it, move to the next one
+ if msg_top['id'] != msg_bot['id'] || msg_top['end'] <= vis_bot
+ call <SID>NM_add_remove_tags_on_screen(msg_top['start'], '-', advance_tags)
+ exec printf('norm %dG', vis_top)
+ call <SID>NM_show_next(0, 1)
+ if has_key(msg_top,'match') && msg_top['match'] != '0'
+ redraw
+ " do this last to hide the latency
+ let filter = ['('] + advance_tags + [')', 'AND', msg_top['id']]
+ call <SID>NM_add_remove_tags(filter, '-', advance_tags)
+ endif
+ return
+ endif
+
+ " entire message does not fit on the screen, scroll down to bottom, max 1/2 screen
+ let jmp = winheight(winnr()) / 2
+ let max = msg_bot['end'] - vis_bot
+ if jmp > max
+ let jmp = max
+ endif
+ exec printf('norm %dGzt', vis_top + jmp)
+ return
endfunction
function! s:NM_show_pipe_message()
" --- --- show screen helper functions {{{2
+function! s:NM_show_get_message_for_line(line)
+ for msg in b:nm_raw_info['msgs']
+ if a:line > msg['end']
+ continue
+ endif
+ return msg
+ endfor
+ return {}
+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['end']
- continue
- endif
-
+ let msg = <SID>NM_show_get_message_for_line(line('.'))
+ if has_key(msg,'id')
return msg['id']
- endfor
+ endif
return ''
endfunction
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,
+ let foldinfo = [ mode_type, mode_start, outlnum-1, len(info['msgs']),
\ printf('[ %d-line citation. Press "c" to show. ]', outlnum - mode_start) ]
let mode_type = ''
endif
if (outlnum - mode_start) > g:notmuch_show_signature_lines_max
let mode_type = ''
elseif part_end
- let foldinfo = [ mode_type, mode_start, outlnum-1,
+ let foldinfo = [ mode_type, mode_start, outlnum-1, len(info['msgs']),
\ printf('[ %d-line signature. Press "s" to show. ]', outlnum - mode_start) ]
let mode_type = ''
endif
" 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]
+ call add(info['folds'], foldinfo[0:3])
+ let info['foldtext'][foldinfo[1]] = foldinfo[4]
endif
- let foldinfo = [ 'text', part_start, part_end,
+ let foldinfo = [ 'text', part_start, part_end, len(info['msgs']),
\ printf('[ %d-line %s. Press "p" to show. ]', part_end - part_start, in_part) ]
let in_part = ''
call add(info['disp'], '')
endif
if match(line, g:notmuch_show_body_end_regexp) != -1
let body_end = len(info['disp'])
- let foldinfo = [ 'bdy', body_start, body_end,
+ let foldinfo = [ 'bdy', body_start, body_end, len(info['msgs']),
\ printf('[ BODY %d - %d lines ]', len(info['msgs']), body_end - body_start) ]
let in_body = 0
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,
+ let foldinfo = [ 'hdr', hdr_start, hdr_end, len(info['msgs']),
\ printf('[ %d-line headers. Press "h" to show. ]', hdr_end + 1 - hdr_start) ]
let msg['header'] = hdr
let in_header = 0
let msg['end'] = len(info['disp'])
call add(info['disp'], '')
- let foldinfo = [ 'msg', msg['start'], msg['end'],
+ let foldinfo = [ 'msg', msg['start'], msg['end'], len(info['msgs']),
\ printf('[ MSG %d - %s ]', len(info['msgs']), msg['descr']) ]
call add(info['msgs'], msg)
if len(m)
let msg['id'] = m[1]
let msg['depth'] = m[2]
- let msg['filename'] = m[3]
+ let msg['match'] = m[3]
+ let msg['filename'] = m[4]
endif
let in_message = 1
endif
if len(foldinfo) && foldinfo[1] < foldinfo[2]
- call add(info['folds'], foldinfo[0:2])
- let info['foldtext'][foldinfo[1]] = foldinfo[3]
+ call add(info['folds'], foldinfo[0:3])
+ let info['foldtext'][foldinfo[1]] = foldinfo[4]
endif
endfor
return info
for afold in info['folds']
exec printf('%d,%dfold', afold[1], afold[2])
+ let state = 'open'
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])
+ let state = 'close'
+ elseif afold[0] == 'msg'
+ let idx = afold[3]
+ let msg = info['msgs'][idx]
+ if has_key(msg,'match') && msg['match'] == '0'
+ let state = 'close'
+ endif
endif
+ exec printf('%dfold%s', afold[1], state)
endfor
endfunction
silent put=a:content
keepjumps 0d
setlocal nomodifiable
+ set scrolloff=0
+ set sidescrolloff=0
execute printf('set filetype=notmuch-%s', a:type)
execute printf('set syntax=notmuch-%s', a:type)
let b:nm_type = a:type
let err = v:shell_error
let delta = reltime(start)
- echo printf('[%s] {%s} %s', reltimestr(delta), string(err), string(cmd))
+ if exists('g:notmuch_debug') && g:notmuch_debug
+ echo printf('[%s] {%s} %s', reltimestr(delta), string(err), string(cmd))
+ endif
if err
echohl Error
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 == ''
+function! s:NM_add_remove_tags(filter, prefix, tags)
+ let filter = len(a:filter) ? a:filter : [<SID>NM_search_thread_id()]
+ if !len(filter)
echoe 'Eeek! I couldn''t find the thead id!'
endif
call map(a:tags, 'a:prefix . v:val')
+ let args = ['tag']
+ call extend(args, a:tags)
+ call add(args, '--')
+ call extend(args, filter)
" TODO: handle errors
- call <SID>NM_run(['tag'] + a:tags + ['--', id])
+ call <SID>NM_run(args)
endfunction
-function! s:NM_add_remove_tags_on_screen(prefix, tags)
- let online = ''
+function! s:NM_add_remove_tags_on_screen(online, prefix, tags)
setlocal modifiable
if a:prefix == '-'
for tagname in a:tags
- exec printf('silent %ss/(\([^)]*\)\<%s\>\([^)]*\))$/(\1\2)/', online, tagname)
+ exec printf('silent! %ss/(\([^)]*\)\<%s\>\([^)]*\))$/(\1\2)/', string(a:online), tagname)
endfor
else
for tagname in a:tags
- exec printf('silent %ss/(\([^)]*\)\([^)]*\))$/(\1 %s)/', online, tagname)
+ exec printf('silent! %ss/(\([^)]*\)\([^)]*\))$/(\1 %s)/', string(a:online), tagname)
endfor
endif
setlocal nomodifiable
projects / notmuch / blobdiff