[PATCH 09/21] vim: split $email_address

diff --git a/d7/274ad27099499bf56411083200501b241f913c b/d7/274ad27099499bf56411083200501b241f913c
new file mode 100644 (file)
index 0000000..e555651
--- /dev/null
+++ b/d7/274ad27099499bf56411083200501b241f913c
@@ -0,0 +1,103 @@
+Return-Path: <felipe.contreras@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 4D36C429E3F\r
+       for <notmuch@notmuchmail.org>; Sat,  2 Nov 2013 07:03:45 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id pmF-5ytJpVUb for <notmuch@notmuchmail.org>;\r
+       Sat,  2 Nov 2013 07:03:39 -0700 (PDT)\r
+Received: from mail-ob0-f181.google.com (mail-ob0-f181.google.com\r
+       [209.85.214.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 145B6429E44\r
+       for <notmuch@notmuchmail.org>; Sat,  2 Nov 2013 07:03:00 -0700 (PDT)\r
+Received: by mail-ob0-f181.google.com with SMTP id wp4so5521643obc.26\r
+       for <notmuch@notmuchmail.org>; Sat, 02 Nov 2013 07:02:59 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
+       bh=ExQsiGyQb9/Wba31gLp+OPy96KC8HMECPWGYpRAaeAw=;\r
+       b=iiey31TAXoz5Oqhsee7oeKlwmrKhh0Vyeg6zxCYtL+0qwoXb5szuVhxESKh6WUk+mw\r
+       5KIzpQkFvXe8CAJqK05JUPaJw8FfD/dxoJvzJpj29UGthKXPet3SBWwQ5T117jIzv9TL\r
+       HDnSCht+qSz//jFS6BvcYTXxeAmiEEI/u0eO/tO4Mgz+AdFLpN0WqV39k2Erim//uStG\r
+       gcQ7AxLeJJRyYnAHg9nndxDtS68ZYbwyEwdr+QDCCEY5jxg5qBfO0+vi9Coz/Gy7SlB2\r
+       RxIJ2dhreBXCHOrWtsSr703hMgukzuOVENMvaLEdSc9qyF/0C3gWcET+3qlHYyGEDfTi\r
+       5JDQ==\r
+X-Received: by 10.182.49.166 with SMTP id v6mr6395036obn.13.1383400979592;\r
+       Sat, 02 Nov 2013 07:02:59 -0700 (PDT)\r
+Received: from localhost (187-162-140-241.static.axtel.net. [187.162.140.241])\r
+       by mx.google.com with ESMTPSA id\r
+       d8sm24736794oeu.6.2013.11.02.07.02.58 for <multiple recipients>\r
+       (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+       Sat, 02 Nov 2013 07:02:58 -0700 (PDT)\r
+From: Felipe Contreras <felipe.contreras@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 09/21] vim: split $email_address\r
+Date: Sat,  2 Nov 2013 07:55:42 -0600\r
+Message-Id: <1383400554-1832-10-git-send-email-felipe.contreras@gmail.com>\r
+X-Mailer: git-send-email 1.8.4.2+fc1\r
+In-Reply-To: <1383400554-1832-1-git-send-email-felipe.contreras@gmail.com>\r
+References: <1383400554-1832-1-git-send-email-felipe.contreras@gmail.com>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 02 Nov 2013 14:03:45 -0000\r
+\r
+Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>\r
+---\r
+ vim/notmuch.vim | 8 +++++---\r
+ 1 file changed, 5 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/vim/notmuch.vim b/vim/notmuch.vim\r
+index aa1b7ef..4bd5f13 100644\r
+--- a/vim/notmuch.vim\r
++++ b/vim/notmuch.vim\r
+@@ -427,7 +427,7 @@ ruby << EOF\r
+       end\r
+ \r
+       $db_name = nil\r
+-      $email_address = nil\r
++      $email = $email_name = $email_address = nil\r
+       $searches = []\r
+       $buf_queue = []\r
+       $threads = []\r
+@@ -452,7 +452,9 @@ ruby << EOF\r
+               end\r
+ \r
+               $db_name = $config['database.path']\r
+-              $email_address = "%s <%s>" % [$config['user.name'], $config['user.primary_email']]\r
++              $email_name = $config['user.name']\r
++              $email_address = $config['user.primary_email']\r
++              $email = "%s <%s>" % [$email_name, $email_address]\r
+       end\r
+ \r
+       def vim_puts(s)\r
+@@ -502,7 +504,7 @@ ruby << EOF\r
+                               m.to = [orig[:from].to_s, orig[:to].to_s]\r
+                       end\r
+                       m.cc = orig[:cc]\r
+-                      m.from = $email_address\r
++                      m.from = $email\r
+                       m.charset = 'utf-8'\r
+                       m.content_transfer_encoding = '7bit'\r
+               end\r
+-- \r
+1.8.4.2+fc1\r
+\r