From: Felipe Contreras <felipe.contreras@gmail.com>
To: notmuch@notmuchmail.org
Cc: Bart Trojanowski <bart@jukie.net>
Subject: [PATCH 7/9] vim: use mailx for sending
Date: Sat, 5 Jun 2010 14:12:40 +0300 [thread overview]
Message-ID: <1275736362-22771-8-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1275736362-22771-1-git-send-email-felipe.contreras@gmail.com>
Possilby used by more systems, and besides the code wasn't really
working properly anyway.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
vim/README | 4 +-
vim/plugin/notmuch.vim | 61 ++++--------------------------------------------
2 files changed, 7 insertions(+), 58 deletions(-)
diff --git a/vim/README b/vim/README
index 8cd3b1a..0807166 100644
--- a/vim/README
+++ b/vim/README
@@ -7,8 +7,8 @@ Dependencies:
notmuch:
Naturally, it expects you have notmuch installed and configured.
- mail:
- To send mail, notmuch.vim uses the UNIX mail command.
+ mailx:
+ To send mail, notmuch.vim uses the UNIX mailx command.
git-diff:
The vim interface makes use of the git-diff.vim syntax file
diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim
index 968c4c1..7b49015 100644
--- a/vim/plugin/notmuch.vim
+++ b/vim/plugin/notmuch.vim
@@ -941,71 +941,20 @@ function! s:NM_compose_send()
let fname = expand('%')
let lnum = 1
let line = getline(lnum)
- let hdrs = {}
let lst_hdr = ''
while match(line, '^$') == -1
- if match(line, '^Notmuch-Help:') != -1
- " skip it
- elseif strlen(lst_hdr) && match(line, '^\s') != -1
- 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
+ if 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
-
- "[-a header] [-b bcc-addr] [-c cc-addr] [-s subject] to-addr
- 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)
+ exec printf(':0,%dd', hdr_starts)
write
- call map(cmd, 's:NM_shell_escape(v:val)')
- let cmdtxt = join(cmd) . '< ' . fname
+ let cmdtxt = 'mailx -t < ' . fname
let out = system(cmdtxt)
let err = v:shell_error
if err
--
1.7.1
next prev parent reply other threads:[~2010-06-05 11:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-05 11:12 [PATCH 0/9] vim improvements Felipe Contreras
2010-06-05 11:12 ` [PATCH 1/9] thread: really clean authors Felipe Contreras
2010-06-05 11:12 ` [PATCH 2/9] vim: add archive support from 'show' Felipe Contreras
2010-06-05 11:12 ` [PATCH 3/9] vim: cleanup search buffer Felipe Contreras
2010-06-05 11:12 ` [PATCH 4/9] vim: cleanup search syntax Felipe Contreras
2010-06-05 11:12 ` [PATCH 5/9] vim: remove add_remove_tags_on_screen() Felipe Contreras
2010-06-05 11:12 ` [PATCH 6/9] vim: add option to mark as read + archive Felipe Contreras
2010-06-05 11:12 ` Felipe Contreras [this message]
2010-06-16 18:28 ` [PATCH 7/9] vim: use mailx for sending Felipe Contreras
2010-06-05 11:12 ` [PATCH 8/9] vim: run(): optimize non-debug path Felipe Contreras
2010-06-05 11:12 ` [PATCH 9/9] vim: include own improved git-diff syntax Felipe Contreras
2010-11-08 17:57 ` [PATCH 0/9] vim improvements Carl Worth
2010-11-08 18:04 ` Carl Worth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1275736362-22771-8-git-send-email-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=bart@jukie.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).