From: Bart Trojanowski <bart@jukie.net>
Date: Wed, 25 Nov 2009 19:17:34 +0000 (-0500)
Subject: vim: allow show_next/previous to skip non-matching messages
X-Git-Tag: 0.1~313^2~39
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=0f39d2c4deef6f774e63d78a226857039d0cd978;p=obsolete%2Fnotmuch-old
vim: allow show_next/previous to skip non-matching messages
---
diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim
index f0106604..c95e6b0e 100644
--- a/vim/plugin/notmuch.vim
+++ b/vim/plugin/notmuch.vim
@@ -110,8 +110,8 @@ let g:notmuch_search_maps = {
" --- --- 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>',
\
@@ -399,10 +399,13 @@ function! s:NM_cmd_show(words)
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
@@ -426,10 +429,13 @@ function! s:NM_show_previous(can_change_thread)
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