mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-12-22 09:24:54 +01:00
vim: use mailx for sending
Possilby used by more systems, and besides the code wasn't really working properly anyway. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
This commit is contained in:
parent
5a8903f05a
commit
6b9aa725ad
2 changed files with 7 additions and 58 deletions
|
@ -7,8 +7,8 @@ Dependencies:
|
||||||
notmuch:
|
notmuch:
|
||||||
Naturally, it expects you have notmuch installed and configured.
|
Naturally, it expects you have notmuch installed and configured.
|
||||||
|
|
||||||
mail:
|
mailx:
|
||||||
To send mail, notmuch.vim uses the UNIX mail command.
|
To send mail, notmuch.vim uses the UNIX mailx command.
|
||||||
|
|
||||||
git-diff:
|
git-diff:
|
||||||
The vim interface makes use of the git-diff.vim syntax file
|
The vim interface makes use of the git-diff.vim syntax file
|
||||||
|
|
|
@ -941,71 +941,20 @@ function! s:NM_compose_send()
|
||||||
let fname = expand('%')
|
let fname = expand('%')
|
||||||
let lnum = 1
|
let lnum = 1
|
||||||
let line = getline(lnum)
|
let line = getline(lnum)
|
||||||
let hdrs = {}
|
|
||||||
let lst_hdr = ''
|
let lst_hdr = ''
|
||||||
while match(line, '^$') == -1
|
while match(line, '^$') == -1
|
||||||
if match(line, '^Notmuch-Help:') != -1
|
if match(line, '^Notmuch-Help:') == -1
|
||||||
" skip it
|
let hdr_starts = lnum - 1
|
||||||
elseif strlen(lst_hdr) && match(line, '^\s') != -1
|
break
|
||||||
let hdrs[lst_hdr][-1] = hdrs[lst_hdr][-1] . substitute(line, '^\s*', ' ', '')
|
|
||||||
else
|
|
||||||
let m = matchlist(line, '^\(\w[^:]*\):\s*\(.*\)\s*$')
|
|
||||||
if !len(m)
|
|
||||||
cursor(lnum, 0)
|
|
||||||
throw printf('Eeek! invalid header on line %d', lnum)
|
|
||||||
endif
|
|
||||||
let key = substitute(m[1], '\<\w', '\U&', 'g')
|
|
||||||
if strlen(m[2])
|
|
||||||
if !has_key(hdrs, key)
|
|
||||||
let hdrs[key] = []
|
|
||||||
endif
|
|
||||||
call add(hdrs[key], m[2])
|
|
||||||
endif
|
|
||||||
let lst_hdr = key
|
|
||||||
endif
|
endif
|
||||||
let lnum = lnum + 1
|
let lnum = lnum + 1
|
||||||
let line = getline(lnum)
|
let line = getline(lnum)
|
||||||
endwhile
|
endwhile
|
||||||
let body_starts = lnum
|
|
||||||
|
|
||||||
"[-a header] [-b bcc-addr] [-c cc-addr] [-s subject] to-addr
|
exec printf(':0,%dd', hdr_starts)
|
||||||
let cmd = ['mail']
|
|
||||||
let tos = []
|
|
||||||
for [key, vals] in items(hdrs)
|
|
||||||
if key == 'To'
|
|
||||||
call extend(tos, vals)
|
|
||||||
elseif key == 'Bcc'
|
|
||||||
for adr in vals
|
|
||||||
call add(cmd, '-b')
|
|
||||||
call add(cmd, adr)
|
|
||||||
endfor
|
|
||||||
elseif key == 'Cc'
|
|
||||||
for adr in vals
|
|
||||||
call add(cmd, '-c')
|
|
||||||
call add(cmd, adr)
|
|
||||||
endfor
|
|
||||||
elseif key == 'Subject'
|
|
||||||
for txt in vals
|
|
||||||
call add(cmd, '-s')
|
|
||||||
call add(cmd, txt)
|
|
||||||
endfor
|
|
||||||
else
|
|
||||||
for val in vals
|
|
||||||
call add(cmd, '-a')
|
|
||||||
call add(cmd, key . ': ' . val)
|
|
||||||
endfor
|
|
||||||
endif
|
|
||||||
endfor
|
|
||||||
call extend(cmd, tos)
|
|
||||||
|
|
||||||
" TODO: make sure we have at least one target
|
|
||||||
" TODO: ask about empty jubject, etc
|
|
||||||
|
|
||||||
exec printf('0,%dd', body_starts)
|
|
||||||
write
|
write
|
||||||
|
|
||||||
call map(cmd, 's:NM_shell_escape(v:val)')
|
let cmdtxt = 'mailx -t < ' . fname
|
||||||
let cmdtxt = join(cmd) . '< ' . fname
|
|
||||||
let out = system(cmdtxt)
|
let out = system(cmdtxt)
|
||||||
let err = v:shell_error
|
let err = v:shell_error
|
||||||
if err
|
if err
|
||||||
|
|
Loading…
Reference in a new issue