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 E7A64431FB6 for ; Wed, 21 Dec 2011 05:20:12 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] 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 FJdCZFJyuWff for ; Wed, 21 Dec 2011 05:20:10 -0800 (PST) Received: from mail-gw3.nixu.fi (mail-gw3.nixu.fi [193.209.237.7]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 90246429E28 for ; Wed, 21 Dec 2011 05:20:10 -0800 (PST) Received: from pps.filterd (mail-gw3 [127.0.0.1]) by mail-gw3.nixu.fi (8.14.4/8.14.4) with SMTP id pBLDJVR9020473; Wed, 21 Dec 2011 15:20:07 +0200 Received: from taco2.nixu.fi (taco2.nixu.fi [194.197.118.31]) by mail-gw3.nixu.fi with ESMTP id 114cs0us9n-1 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); Wed, 21 Dec 2011 15:20:05 +0200 Received: from taco2.nixu.fi (taco2.nixu.fi [194.197.118.31]) by taco2.nixu.fi (8.14.3/8.14.3/Debian-5+lenny1) with ESMTP id pBLDK5mA012834; Wed, 21 Dec 2011 15:20:05 +0200 From: Tomi Ollila To: David Edmondson , notmuch@notmuchmail.org Subject: Re: [PATCH] emacs: Don't prompt the user to choose from zero matching addresses. In-Reply-To: <1324470927-15353-1-git-send-email-dme@dme.org> References: <1324470927-15353-1-git-send-email-dme@dme.org> User-Agent: Notmuch/0.10.2+112~g4a2a271 (http://notmuchmail.org) Emacs/23.3.1 (i686-pc-linux-gnu) X-Face: HhBM'cA~ MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.5.7110, 1.0.211, 0.0.0000 definitions=2011-12-21_06:2011-12-21, 2011-12-20, 1970-01-01 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 ipscore=0 suspectscore=0 phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=6.0.2-1012030000 definitions=main-1112210087 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: Wed, 21 Dec 2011 13:20:13 -0000 On Wed, 21 Dec 2011 12:35:27 +0000, David Edmondson wrote: > If the address matching function generates no matches, don't prompt > the user to choose between them (!). Instead, generate a message to > report that there were no matches. > --- LGTM > emacs/notmuch-address.el | 21 ++++++++++++++------- > 1 files changed, 14 insertions(+), 7 deletions(-) > > diff --git a/emacs/notmuch-address.el b/emacs/notmuch-address.el > index 1a7c577..8eba7a0 100644 > --- a/emacs/notmuch-address.el > +++ b/emacs/notmuch-address.el > @@ -54,15 +54,22 @@ line." > (completion-ignore-case t) > (options (notmuch-address-options orig)) > (num-options (length options)) > - (chosen (if (eq num-options 1) > - (car options) > + (chosen (cond > + ((eq num-options 0) > + nil) > + ((eq num-options 1) > + (car options)) > + (t > (completing-read (format "Address (%s matches): " num-options) > (cdr options) nil nil (car options) > - 'notmuch-address-history)))) > - (when chosen > - (push chosen notmuch-address-history) > - (delete-region beg end) > - (insert chosen)))) > + 'notmuch-address-history))))) > + (if chosen > + (progn > + (push chosen notmuch-address-history) > + (delete-region beg end) > + (insert chosen)) > + (message "No matches.") > + (ding)))) > > ;; Copied from `w3m-which-command'. > (defun notmuch-address-locate-command (command) > -- > 1.7.7.3 Tomi