[PATCH] emacs: Don't prompt the user to choose from zero matching addresses.

diff --git a/22/f51efafeef27e20c47fef2ecf322f4ca8b570a b/22/f51efafeef27e20c47fef2ecf322f4ca8b570a
new file mode 100644 (file)
index 0000000..ef5db0c
--- /dev/null
+++ b/22/f51efafeef27e20c47fef2ecf322f4ca8b570a
@@ -0,0 +1,98 @@
+Return-Path: <dme@dme.org>\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 CB55B429E28\r
+       for <notmuch@notmuchmail.org>; Wed, 21 Dec 2011 04:35:34 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[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 EF6vs-pbQCxg for <notmuch@notmuchmail.org>;\r
+       Wed, 21 Dec 2011 04:35:34 -0800 (PST)\r
+Received: from mail-we0-f181.google.com (mail-we0-f181.google.com\r
+       [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 32D05431FB6\r
+       for <notmuch@notmuchmail.org>; Wed, 21 Dec 2011 04:35:34 -0800 (PST)\r
+Received: by werm12 with SMTP id m12so3310882wer.26\r
+       for <notmuch@notmuchmail.org>; Wed, 21 Dec 2011 04:35:31 -0800 (PST)\r
+Received: by 10.216.131.223 with SMTP id m73mr8785155wei.52.1324470931323;\r
+       Wed, 21 Dec 2011 04:35:31 -0800 (PST)\r
+Received: from hotblack-desiato.hh.sledj.net\r
+       (host81-149-164-25.in-addr.btopenworld.com. [81.149.164.25])\r
+       by mx.google.com with ESMTPS id\r
+       en20sm13113526wid.10.2011.12.21.04.35.29\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Wed, 21 Dec 2011 04:35:30 -0800 (PST)\r
+Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000)\r
+       id 68BB0A024F; Wed, 21 Dec 2011 12:35:28 +0000 (GMT)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] emacs: Don't prompt the user to choose from zero matching\r
+       addresses.\r
+Date: Wed, 21 Dec 2011 12:35:27 +0000\r
+Message-Id: <1324470927-15353-1-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 1.7.7.3\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: Wed, 21 Dec 2011 12:35:34 -0000\r
+\r
+If the address matching function generates no matches, don't prompt\r
+the user to choose between them (!). Instead, generate a message to\r
+report that there were no matches.\r
+---\r
+ emacs/notmuch-address.el |   21 ++++++++++++++-------\r
+ 1 files changed, 14 insertions(+), 7 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-address.el b/emacs/notmuch-address.el\r
+index 1a7c577..8eba7a0 100644\r
+--- a/emacs/notmuch-address.el\r
++++ b/emacs/notmuch-address.el\r
+@@ -54,15 +54,22 @@ line."\r
+        (completion-ignore-case t)\r
+        (options (notmuch-address-options orig))\r
+        (num-options (length options))\r
+-       (chosen (if (eq num-options 1)\r
+-                   (car options)\r
++       (chosen (cond\r
++                ((eq num-options 0)\r
++                 nil)\r
++                ((eq num-options 1)\r
++                 (car options))\r
++                (t\r
+                  (completing-read (format "Address (%s matches): " num-options)\r
+                                   (cdr options) nil nil (car options)\r
+-                                  'notmuch-address-history))))\r
+-    (when chosen\r
+-      (push chosen notmuch-address-history)\r
+-      (delete-region beg end)\r
+-      (insert chosen))))\r
++                                  'notmuch-address-history)))))\r
++    (if chosen\r
++      (progn\r
++        (push chosen notmuch-address-history)\r
++        (delete-region beg end)\r
++        (insert chosen))\r
++      (message "No matches.")\r
++      (ding))))\r
+ \r
+ ;; Copied from `w3m-which-command'.\r
+ (defun notmuch-address-locate-command (command)\r
+-- \r
+1.7.7.3\r
+\r