a9/7b486c171228afe9d1dafffa2a3e1f515224e0

   1 Return-Path: <felipe.contreras@gmail.com>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id AEBD7431FD0\r
   6         for <notmuch@notmuchmail.org>; Sun,  6 Feb 2011 05:29:14 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.799\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
  12         tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
  13         FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  14 Received: from olra.theworths.org ([127.0.0.1])\r
  15         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  16         with ESMTP id Al-gaYzgo6xl for <notmuch@notmuchmail.org>;\r
  17         Sun,  6 Feb 2011 05:29:14 -0800 (PST)\r
  18 Received: from mail-fx0-f53.google.com (mail-fx0-f53.google.com\r
  19         [209.85.161.53]) (using TLSv1 with cipher RC4-MD5 (128/128 bits))\r
  20         (No client certificate requested)\r
  21         by olra.theworths.org (Postfix) with ESMTPS id 1F94E431FB6\r
  22         for <notmuch@notmuchmail.org>; Sun,  6 Feb 2011 05:29:13 -0800 (PST)\r
  23 Received: by mail-fx0-f53.google.com with SMTP id 11so4326160fxm.26\r
  24         for <notmuch@notmuchmail.org>; Sun, 06 Feb 2011 05:29:13 -0800 (PST)\r
  25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
  26         h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer\r
  27         :in-reply-to:references;\r
  28         bh=R9vqx0V4mYaWObfogZfksHIo+DorUXUTIYGWUW1p7ZA=;\r
  29         b=K/WaxyogYc+BCEqKQx6VfluiwRlP5xtg/6FgbJ3rWZiDhvCrt/abUERVpfc6zV95mC\r
  30         vog1gd4qg24WbsqkrzbjCLrRXQxqNKdHTyTBAPoyFYytHE1660PFKkGlptrP8iVkxGoQ\r
  31         Pw0w79eRy6gDV2cCvfLvPNBvAVAgGrAsvfGos=\r
  32 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;\r
  33         h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
  34         b=bU3u4R4AtfMoO/99C5O0XxLhSLXfUgFPsDk4luM4MZuAFx0K4aSMxyKrBganA9T7dD\r
  35         1FXdBvUrFGvrOseT12ccKkedfmcOCM8D60tsgjGcs+BRtBR/7OZ81mruDynQ8DNlgraT\r
  36         kDxJpTzXr4guoaY5gTo/o3XFD2zIhkfFdLIFE=\r
  37 Received: by 10.223.96.67 with SMTP id g3mr8755806fan.19.1296998953731;\r
  38         Sun, 06 Feb 2011 05:29:13 -0800 (PST)\r
  39 Received: from localhost (a91-153-253-80.elisa-laajakaista.fi [91.153.253.80])\r
  40         by mx.google.com with ESMTPS id a2sm842091faw.22.2011.02.06.05.29.12\r
  41         (version=TLSv1/SSLv3 cipher=RC4-MD5);\r
  42         Sun, 06 Feb 2011 05:29:13 -0800 (PST)\r
  43 From: Felipe Contreras <felipe.contreras@gmail.com>\r
  44 To: notmuch@notmuchmail.org\r
  45 Subject: [PATCH 1/2] vim: use sendmail directly\r
  46 Date: Sun,  6 Feb 2011 15:29:06 +0200\r
  47 Message-Id: <1296998947-13683-2-git-send-email-felipe.contreras@gmail.com>\r
  48 X-Mailer: git-send-email 1.7.4.1.g4f7e4.dirty\r
  49 In-Reply-To: <1296998947-13683-1-git-send-email-felipe.contreras@gmail.com>\r
  50 References: <1296998947-13683-1-git-send-email-felipe.contreras@gmail.com>\r
  51 X-BeenThere: notmuch@notmuchmail.org\r
  52 X-Mailman-Version: 2.1.13\r
  53 Precedence: list\r
  54 List-Id: "Use and development of the notmuch mail system."\r
  55         <notmuch.notmuchmail.org>\r
  56 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  57         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  58 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  59 List-Post: <mailto:notmuch@notmuchmail.org>\r
  60 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  61 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  62         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  63 X-List-Received-Date: Sun, 06 Feb 2011 13:29:14 -0000\r
  64 \r
  65 The problem with 'mailx' is that it's not standardized, and it doesn't\r
  66 allow the -f option, which is pretty important on many sendmail\r
  67 configurations.\r
  68 \r
  69 Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>\r
  70 ---\r
  71  vim/plugin/notmuch.vim |    8 +++++---\r
  72  1 files changed, 5 insertions(+), 3 deletions(-)\r
  73 \r
  74 diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim\r
  75 index 3375a96..002b771 100644\r
  76 --- a/vim/plugin/notmuch.vim\r
  77 +++ b/vim/plugin/notmuch.vim\r
  78 @@ -24,6 +24,7 @@\r
  79  \r
  80  let s:notmuch_defaults = {\r
  81          \ 'g:notmuch_cmd':                           'notmuch'                    ,\r
  82 +        \ 'g:notmuch_sendmail':                      'sendmail'                   ,\r
  83          \ 'g:notmuch_debug':                         0                            ,\r
  84          \\r
  85          \ 'g:notmuch_search_newest_first':           1                            ,\r
  86 @@ -948,18 +949,19 @@ function! s:NM_compose_send()\r
  87          let line = getline(lnum)\r
  88          let lst_hdr = ''\r
  89          while match(line, '^$') == -1\r
  90 -                if match(line, '^Notmuch-Help:') == -1\r
  91 +                if !exists("hdr_starts") && match(line, '^Notmuch-Help:') == -1\r
  92                          let hdr_starts = lnum - 1\r
  93 -                        break\r
  94                  endif\r
  95                  let lnum = lnum + 1\r
  96                  let line = getline(lnum)\r
  97          endwhile\r
  98 +        let body_starts = lnum - 1\r
  99  \r
 100 +        call append(body_starts, 'Date: ' . strftime('%a, %d %b %Y %H:%M:%S %z'))\r
 101          exec printf(':0,%dd', hdr_starts)\r
 102          write\r
 103  \r
 104 -        let cmdtxt = 'mailx -t < ' . fname\r
 105 +        let cmdtxt = g:notmuch_sendmail . ' -t < ' . fname\r
 106          let out = system(cmdtxt)\r
 107          let err = v:shell_error\r
 108          if err\r
 109 -- \r
 110 1.7.4.1.g4f7e4.dirty\r
 111 \r