From 898b173a182ee37d6e54f5f09284f99a8aef8892 Mon Sep 17 00:00:00 2001 From: Bart Trojanowski Date: Wed, 25 Nov 2009 14:18:29 -0500 Subject: [PATCH] vim: more cleanup and fixes for show_next/previous handlers --- vim/plugin/notmuch.vim | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim index c95e6b0e..7927dd62 100644 --- a/vim/plugin/notmuch.vim +++ b/vim/plugin/notmuch.vim @@ -410,20 +410,19 @@ function! s:NM_show_previous(can_change_thread, find_matching) 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 NM_kill_this_buffer() - if line('.') != line('0') + if line('.') > 1 norm k call NM_search_show_thread() norm G - call NM_show_previous(0) + call NM_show_previous(0, a:find_matching) else echo 'No more messages.' endif @@ -440,14 +439,16 @@ function! s:NM_show_next(can_change_thread, find_matching) 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 NM_show_next_thread() endif +endfunction + +function! s:NM_show_next_thread() call NM_kill_this_buffer() if line('.') != line('$') norm j @@ -465,10 +466,6 @@ function! s:NM_show_mark_read_then_archive_thread() 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 -- 2.26.2