From b3779b9d2b3eaae81c9821f9ce99c981bb7e86f6 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Fri, 21 Feb 2014 14:16:36 +1900 Subject: [PATCH] [PATCH 3/4] emacs: Fix `notmuch-user-other-email' when no other emails are configured --- c9/94db369b854198e23340729b06326f3e4c8dfc | 100 ++++++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 c9/94db369b854198e23340729b06326f3e4c8dfc diff --git a/c9/94db369b854198e23340729b06326f3e4c8dfc b/c9/94db369b854198e23340729b06326f3e4c8dfc new file mode 100644 index 000000000..5f313e324 --- /dev/null +++ b/c9/94db369b854198e23340729b06326f3e4c8dfc @@ -0,0 +1,100 @@ +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 26D09431FBD + for ; Thu, 20 Feb 2014 11:16:54 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[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 o0gkHtNWsGH6 for ; + Thu, 20 Feb 2014 11:16:50 -0800 (PST) +Received: from dmz-mailsec-scanner-7.mit.edu (dmz-mailsec-scanner-7.mit.edu + [18.7.68.36]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 56627431FC2 + for ; Thu, 20 Feb 2014 11:16:48 -0800 (PST) +X-AuditID: 12074424-f79e26d000000c70-09-5306549f7e98 +Received: from mailhub-auth-1.mit.edu ( [18.9.21.35]) + (using TLS with cipher AES256-SHA (256/256 bits)) + (Client did not present a certificate) + by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP + id B6.37.03184.F9456035; Thu, 20 Feb 2014 14:16:47 -0500 (EST) +Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) + by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id s1KJGhEP014146; + Thu, 20 Feb 2014 14:16:43 -0500 +Received: from drake.dyndns.org (26-4-182.dynamic.csail.mit.edu [18.26.4.182]) + (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s1KJGfuW012827 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Thu, 20 Feb 2014 14:16:42 -0500 +Received: from amthrax by drake.dyndns.org with local (Exim 4.77) + (envelope-from ) + id 1WGZ6v-0004ZA-2E; Thu, 20 Feb 2014 14:16:41 -0500 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH 3/4] emacs: Fix `notmuch-user-other-email' when no other + emails are configured +Date: Thu, 20 Feb 2014 14:16:36 -0500 +Message-Id: <1392923797-17045-4-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.8.4.rc3 +In-Reply-To: <1392923797-17045-1-git-send-email-amdragon@mit.edu> +References: <1392923797-17045-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFtrJIsWRmVeSWpSXmKPExsUixCmqrDs/hC3YYM9LIYvXCyaxWVy/OZPZ + gclj9dpOFo9nq24xBzBFcdmkpOZklqUW6dslcGVcOMhfsJ+tYtuV62wNjGtYuxg5OSQETCSO + 3z4PZYtJXLi3ng3EFhKYzSRx9bRnFyMXkL2RUeLSmwlMEM4RJomGi5vYIJy5jBILX10Aa2cT + 0JDYtn85I4gtIiAtsfPubLA4s4CNxOaPj4HiHBzCAnES/ZdjQEwWAVWJxZdDQCp4BRwkpvd3 + Qx2hJLHw1DYwm1PAUWJp/wdWkHIhoJrOrToTGPkXMDKsYpRNya3SzU3MzClOTdYtTk7My0st + 0jXXy80s0UtNKd3ECAohdheVHYzNh5QOMQpwMCrx8J6QYgsWYk0sK67MPcQoycGkJMq7IgAo + xJeUn1KZkVicEV9UmpNafIhRgoNZSYS3yQYox5uSWFmVWpQPk5LmYFES5621+BUkJJCeWJKa + nZpakFoEk5Xh4FCS4A0NBmoULEpNT61Iy8wpQUgzcXCCDOcBGh4ZBDK8uCAxtzgzHSJ/ilFR + Spz3KUhCACSRUZoH1wuL8VeM4kCvCPPOB1nBA0wPcN2vgAYzAQ0u2cgKMrgkESEl1cDYEJ62 + 0uaX+NOvc1fnTlgofsak5Q9XyMl93LKed6bpWc+Vz1vkLNa+fjMz03znp7MUDk3dm+a4XyRX + 4fIlu91m8p3fl+y1a3RvbPs3qzU8NX5+RfLp5pSnHDra6h5p241+bDNRjl2WmaP0K8ZMa/NB + 7+8Hjyu+3XKh8fj8Q986z/VMvmRf1PNKiaU4I9FQi7moOBEAFwhhQcwCAAA= +Cc: bjonnh-nm@bjonnh.net +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: Thu, 20 Feb 2014 19:16:54 -0000 + +Thanks to the previous patch, this no longer crashes in this +situation, but now would return (""). Fix it to return () when no +emails are configured. +--- + emacs/notmuch-lib.el | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el +index 09110b5..2fefdad 100644 +--- a/emacs/notmuch-lib.el ++++ b/emacs/notmuch-lib.el +@@ -220,7 +220,7 @@ on the command line, and then retry your notmuch command"))) + + (defun notmuch-user-other-email () + "Return the user.other_email value (as a list) from the notmuch configuration." +- (split-string (notmuch-config-get "user.other_email") "\n")) ++ (split-string (notmuch-config-get "user.other_email") "\n" t)) + + (defun notmuch-poll () + "Run \"notmuch new\" or an external script to import mail. +-- +1.8.4.rc3 + -- 2.26.2