X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=vim%2Fplugin%2Fnotmuch.vim;h=6726a5e79f9bcac2ffbeea34f998ff29a07e032b;hp=bdf03ba6c8edf14a99f9a5081b99ce9e654c87ce;hb=5cdf424657e2fd19a4563f750b0be02cc46b8920;hpb=4aeb291c783c18d0c63277275f67798f227e3017
diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim
index bdf03ba6..6726a5e7 100644
--- a/vim/plugin/notmuch.vim
+++ b/vim/plugin/notmuch.vim
@@ -18,7 +18,8 @@
" along with Notmuch. If not, see .
"
" Authors: Bart Trojanowski
-" Contributors: Peter Hartman
+" Contributors: Felipe Contreras ,
+" Peter Hartman
"
" --- configuration defaults {{{1
@@ -308,12 +309,12 @@ function! s:NM_search_edit()
endfunction
function! s:NM_search_archive_thread()
- call NM_add_remove_tags([], '-', ['inbox'])
+ call NM_tag([], ['-inbox'])
norm j
endfunction
function! s:NM_search_mark_read_then_archive_thread()
- call NM_add_remove_tags([], '-', ['unread', 'inbox'])
+ call NM_tag([], ['-unread', '-inbox'])
norm j
endfunction
@@ -404,7 +405,8 @@ function! s:NM_search_add_remove_tags(prompt, prefix, intags)
else
let tags = a:intags
endif
- call NM_add_remove_tags([], a:prefix, tags)
+ call map(tags, 'a:prefix . v:val')
+ call NM_tag([], tags)
endfunction
" --- implement show screen {{{1
@@ -494,11 +496,12 @@ function! s:NM_show_next_thread()
endfunction
function! s:NM_show_archive_thread()
- echo 'not implemented'
+ call NM_tag(b:nm_search_words, ['-inbox'])
+ call NM_show_next_thread()
endfunction
function! s:NM_show_mark_read_then_archive_thread()
- call NM_add_remove_tags(b:nm_search_words, '-', ['unread', 'inbox'])
+ call NM_tag(b:nm_search_words, ['-unread', '-inbox'])
call NM_show_next_thread()
endfunction
@@ -562,7 +565,8 @@ function! s:NM_show_advance_marking_read_and_archiving()
let filter = NM_combine_tags('tag:', advance_tags, 'OR', '()')
\ + ['AND']
\ + NM_combine_tags('', ids, 'OR', '()')
- call NM_add_remove_tags(filter, '-', advance_tags)
+ call map(advance_tags, '"+" . v:val')
+ call NM_tag(filter, advance_tags)
call NM_show_next(1, 1)
return
endif
@@ -581,7 +585,8 @@ function! s:NM_show_advance_marking_read_and_archiving()
" do this last to hide the latency
let filter = NM_combine_tags('tag:', advance_tags, 'OR', '()')
\ + ['AND', msg_top['id']]
- call NM_add_remove_tags(filter, '-', advance_tags)
+ call map(advance_tags, '"-" . v:val')
+ call NM_tag(filter, advance_tags)
endif
return
endif
@@ -1265,12 +1270,11 @@ function! s:NM_search_expand(arg)
let b:nm_prev_bufnr = prev_bufnr
endfunction
-function! s:NM_add_remove_tags(filter, prefix, tags)
+function! s:NM_tag(filter, tags)
let filter = len(a:filter) ? a:filter : [NM_search_thread_id()]
if !len(filter)
throw '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, '--')