vim: use sendmail directly

The problem with 'mailx' is that it's not standardized, and it doesn't
allow the -f option, which is pretty important on many sendmail
configurations.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>

diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim
index 6726a5e79f9bcac2ffbeea34f998ff29a07e032b..6b82abedbfe2b9a655021bd6e7d99735f25356fa 100644 (file)
--- a/vim/plugin/notmuch.vim
+++ b/vim/plugin/notmuch.vim
@@ -25,6 +25,7 @@
 
 let s:notmuch_defaults = {
         \ 'g:notmuch_cmd':                           'notmuch'                    ,
 
 let s:notmuch_defaults = {
         \ 'g:notmuch_cmd':                           'notmuch'                    ,

+        \ 'g:notmuch_sendmail':                      'sendmail'                   ,

         \ 'g:notmuch_debug':                         0                            ,
         \
         \ 'g:notmuch_search_newest_first':           1                            ,
         \ 'g:notmuch_debug':                         0                            ,
         \
         \ 'g:notmuch_search_newest_first':           1                            ,


@@ -949,18 +950,19 @@ function! s:NM_compose_send()
         let line = getline(lnum)
         let lst_hdr = ''
         while match(line, '^$') == -1
         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
                         let hdr_starts = lnum - 1

-                        break

                 endif
                 let lnum = lnum + 1
                 let line = getline(lnum)
         endwhile
                 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
 
         exec printf(':0,%dd', hdr_starts)
         write
 

-        let cmdtxt = 'mailx -t < ' . fname
+        let cmdtxt = g:notmuch_sendmail . ' -t < ' . fname

         let out = system(cmdtxt)
         let err = v:shell_error
         if err
         let out = system(cmdtxt)
         let err = v:shell_error
         if err