X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;ds=sidebyside;f=vim%2Fplugin%2Fnotmuch.vim;h=c731c4714da7db18a7d2727e8248b384af7349c6;hb=6bd02fb4dbee9e0fc372661af573a2ac380fed8a;hp=3375a96c4bc4cfeeb582a3cad768db57ff77488e;hpb=ac9b9cf56a05f626dfa2c91e3c522df32565af70;p=notmuch
diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim
index 3375a96c..c731c471 100644
--- a/vim/plugin/notmuch.vim
+++ b/vim/plugin/notmuch.vim
@@ -18,12 +18,14 @@
" along with Notmuch. If not, see .
"
" Authors: Bart Trojanowski
-" Contributors: Peter Hartman
+" Contributors: Felipe Contreras ,
+" Peter Hartman
"
" --- configuration defaults {{{1
let s:notmuch_defaults = {
\ 'g:notmuch_cmd': 'notmuch' ,
+ \ 'g:notmuch_sendmail': 'sendmail' ,
\ 'g:notmuch_debug': 0 ,
\
\ 'g:notmuch_search_newest_first': 1 ,
@@ -118,8 +120,10 @@ let g:notmuch_search_maps = {
\ '': ':call NM_search_show_thread(0)',
\ '': ':call NM_search_show_thread(1)',
\ '': ':call NM_search_expand('''')',
+ \ 'I': ':call NM_search_mark_read_thread()',
\ 'a': ':call NM_search_archive_thread()',
\ 'A': ':call NM_search_mark_read_then_archive_thread()',
+ \ 'D': ':call NM_search_delete_thread()',
\ 'f': ':call NM_search_filter()',
\ 'm': ':call NM_new_mail()',
\ 'o': ':call NM_search_toggle_order()',
@@ -147,8 +151,11 @@ let g:notmuch_show_maps = {
\ 'h': ':call NM_show_fold_toggle(''h'', ''hdr'', !g:notmuch_show_fold_headers)',
\ 'i': ':call NM_show_fold_toggle(''s'', ''sig'', !g:notmuch_show_fold_signatures)',
\
+ \ 'I': ':call NM_show_mark_read_thread()',
\ 'a': ':call NM_show_archive_thread()',
\ 'A': ':call NM_show_mark_read_then_archive_thread()',
+ \ 'D': ':call NM_show_delete_thread()',
+ \ 'd': ':call NM_show_delete_message()',
\ 'N': ':call NM_show_mark_read_then_next_open_message()',
\ 'v': ':call NM_show_view_all_mime_parts()',
\ '+': ':call NM_show_add_tag()',
@@ -307,6 +314,11 @@ function! s:NM_search_edit()
endif
endfunction
+function! s:NM_search_mark_read_thread()
+ call NM_tag([], ['-unread'])
+ norm j
+endfunction
+
function! s:NM_search_archive_thread()
call NM_tag([], ['-inbox'])
norm j
@@ -317,6 +329,11 @@ function! s:NM_search_mark_read_then_archive_thread()
norm j
endfunction
+function! s:NM_search_delete_thread()
+ call NM_tag([], ['+delete','-inbox','-unread'])
+ norm j
+endfunction
+
function! s:NM_search_filter()
call NM_search_filter_helper('Filter: ', '', '')
endfunction
@@ -494,6 +511,11 @@ function! s:NM_show_next_thread()
endif
endfunction
+function! s:NM_show_mark_read_thread()
+ call NM_tag(b:nm_search_words, ['-unread'])
+ call NM_show_next_thread()
+endfunction
+
function! s:NM_show_archive_thread()
call NM_tag(b:nm_search_words, ['-inbox'])
call NM_show_next_thread()
@@ -504,6 +526,16 @@ function! s:NM_show_mark_read_then_archive_thread()
call NM_show_next_thread()
endfunction
+function! s:NM_show_delete_thread()
+ call NM_tag(b:nm_search_words, ['+delete', '-inbox', '-unread'])
+ call NM_show_next_thread()
+endfunction
+
+function! s:NM_show_delete_message()
+ let msg = NM_show_get_message_for_line(line('.'))
+ call NM_tag([msg['id']], ['+delete', '-inbox', '-unread'])
+endfunction
+
function! s:NM_show_mark_read_then_next_open_message()
echo 'not implemented'
endfunction
@@ -948,18 +980,28 @@ function! s:NM_compose_send()
let line = getline(lnum)
let lst_hdr = ''
while match(line, '^$') == -1
- if match(line, '^Notmuch-Help:') == -1
+ if !exists("hdr_starts") && match(line, '^Notmuch-Help:') == -1
let hdr_starts = lnum - 1
- break
endif
let lnum = lnum + 1
let line = getline(lnum)
endwhile
+ let body_starts = lnum - 1
+ call append(body_starts, 'Date: ' . strftime('%a, %d %b %Y %H:%M:%S %z'))
exec printf(':0,%dd', hdr_starts)
write
- let cmdtxt = 'mailx -t < ' . fname
+ let line = getline(1)
+ let m = matchlist(line, '^From:\s*\(.*\)\s*<\(.*\)>$')
+ if (len(m) >= 2)
+ let from = m[2]
+ else
+ let m = matchlist(line, '^From:\s*\(.*\)$')
+ let from = m[1]
+ endif
+
+ let cmdtxt = g:notmuch_sendmail . ' -t -f ' . from . ' < ' . fname
let out = system(cmdtxt)
let err = v:shell_error
if err