When show mode is invoked it could be displaying just the matched messages or everything. This flag is passed to NM_search_show_thread(). It is then stored in a buffer variable, b:nm_show_everything, and used for subsequent calls to NM_search_show_thread() triggered by <Space>, <C-n> and <C-p>. Signed-off-by: Bart Trojanowski <bart@jukie.net> --- vim/plugin/notmuch.vim | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim index b415f50..34d70d9 100644 --- a/vim/plugin/notmuch.vim +++ b/vim/plugin/notmuch.vim @@ -275,6 +275,7 @@ function! s:NM_search_show_thread(everything) call add(words, ')') endif call <SID>NM_cmd_show(words) + let b:nm_show_everything = a:everything endfunction function! s:NM_search_prompt() @@ -430,6 +431,7 @@ function! s:NM_cmd_show(words) endfunction function! s:NM_show_previous(can_change_thread, find_matching) + let everything = exists('b:nm_show_everything') ? b:nm_show_everything : 0 let info = b:nm_raw_info let lnum = line('.') for msg in reverse(copy(info['msgs'])) @@ -450,7 +452,7 @@ function! s:NM_show_previous(can_change_thread, find_matching) call <SID>NM_kill_this_buffer() if line('.') > 1 norm k - call <SID>NM_search_show_thread() + call <SID>NM_search_show_thread(everything) norm G call <SID>NM_show_previous(0, a:find_matching) else @@ -479,10 +481,11 @@ function! s:NM_show_next(can_change_thread, find_matching) endfunction function! s:NM_show_next_thread() + let everything = exists('b:nm_show_everything') ? b:nm_show_everything : 0 call <SID>NM_kill_this_buffer() if line('.') != line('$') norm j - call <SID>NM_search_show_thread() + call <SID>NM_search_show_thread(everything) else echo 'No more messages.' endif -- 1.6.4.4.2.gc2f148