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