" --- --- 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
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
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
+ echo 'filter = ' . string(filter) . ' ... ' . string(type(filter))
call map(a:tags, 'a:prefix . v:val')
" TODO: handle errors
- call <SID>NM_run(['tag'] + a:tags + ['--', id])
+ let args = ['tag']
+ call extend(args, a:tags)
+ call add(args, '--')
+ call extend(args, filter)
+ echo 'NUM_run( ' . string(args) . ' )'
+ 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