added support for archive command

[notmuch] / vim / plugin / notmuch.vim

diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim
index b78a638236415f79619d0f1005da5bdaec11c1a8..ecf7b9defe94859f581528a078407383b0c64043 100644 (file)
--- a/vim/plugin/notmuch.vim
+++ b/vim/plugin/notmuch.vim
@@ -102,7 +102,7 @@ function! s:NM_cmd_search(words)
         let disp = copy(lines)
         call map(disp, 'substitute(v:val, "^thread:\\S* ", "", "")' )
 
-        call s:NM_newBuffer('search', join(disp, "\n"))
+        call <SID>NM_newBuffer('search', join(disp, "\n"))
         let b:nm_raw_lines = lines
 
         call <SID>NM_set_map(g:notmuch_search_maps)
@@ -115,7 +115,7 @@ endfunction
 function! s:NM_search_show_thread()
         let id = <SID>NM_search_find_thread_id()
         if id != ''
-                call s:NM_cmd_show([id])
+                call <SID>NM_cmd_show([id])
         endif
 endfunction
 
@@ -136,7 +136,10 @@ function! s:NM_search_edit()
 endfunction
 
 function! s:NM_search_archive_thread()
-        call <SID>NM_search_remove_tags('inbox')
+        call <SID>NM_add_remove_tags('-', ['inbox'])
+        setlocal modifiable
+        s/(\([^)]*\)\<inbox\>\([^)]*\))$/(\1\2)/
+        setlocal nomodifiable
         norm j
 endfunction
 
@@ -170,7 +173,7 @@ endfunction
 
 function! s:NM_search_refresh_view()
         let lno = line('.')
-        call s:NM_cmd_search(g:notmuch_current_search_words)
+        call <SID>NM_cmd_search(g:notmuch_current_search_words)
         " FIXME: should find the line of the thread we were on if possible
         exec printf('norm %dG', lno)
 endfunction
@@ -190,23 +193,27 @@ function! s:NM_search_find_thread_id()
 endfunction
 
 function! s:NM_search_add_remove_tags(prompt, prefix, intags)
-        let id = <SID>NM_search_find_thread_id()
-        if id != ''
-                if type(a:intags) != type([]) || len(a:intags) == 0
-                        " TODO: input() can support completion
-                        let text = input(a:prompt)
-                        if !strlen(text)
-                                return
-                        endif
-                        let tags = split(text, ' ')
-                else
-                        let tags = a:intags
+        if type(a:intags) != type([]) || len(a:intags) == 0
+                " TODO: input() can support completion
+                let text = input(a:prompt)
+                if !strlen(text)
+                        return
                 endif
-                call map(tags, 'a:prefix . v:val')
-                " TODO: handle errors
-                call <SID>NM_run(['tag'] + tags + ['--', id])
-                call <SID>NM_search_refresh_view()
+                call <SID>NM_add_remove_tags(prefix, split(text, ' '))
+        else
+                call <SID>NM_add_remove_tags(prefix, a:intags)
+        endif
+        call <SID>NM_search_refresh_view()
+endfunction
+
+function! s:NM_add_remove_tags(prefix, tags)
+        let id = <SID>NM_search_find_thread_id()
+        if id == ''
+                echoe 'Eeek! I couldn''t find the thead id!'
         endif
+        call map(a:tags, 'a:prefix . v:val')
+        " TODO: handle errors
+        call <SID>NM_run(['tag'] + a:tags + ['--', id])
 endfunction
 
 " --- implement show screen {{{1
@@ -218,13 +225,13 @@ function! s:NM_cmd_show(words)
 
         let info = s:NM_cmd_show_parse(lines)
 
-        call s:NM_newBuffer('show', join(info['disp'], "\n"))
+        call <SID>NM_newBuffer('show', join(info['disp'], "\n"))
         setlocal bufhidden=delete
         let b:nm_raw_info = info
         let b:nm_prev_bufnr = prev_bufnr
 
-        call s:NM_cmd_show_mkfolds()
-        call s:NM_cmd_show_mksyntax()
+        call <SID>NM_cmd_show_mkfolds()
+        call <SID>NM_cmd_show_mksyntax()
         call <SID>NM_set_map(g:notmuch_show_maps)
         setlocal foldtext=NM_cmd_show_foldtext()
         setlocal fillchars=
@@ -550,7 +557,7 @@ endfunction
 
 function! NotMuch(args)
         if !strlen(a:args)
-                call s:NM_cmd_search(g:notmuch_current_search_words)
+                call <SID>NM_cmd_search(g:notmuch_current_search_words)
                 return
         endif