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 8406A431FD2 for ; Sun, 29 Jan 2012 17:43:27 -0800 (PST) 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 K7Ugb7iAWe9y for ; Sun, 29 Jan 2012 17:43:27 -0800 (PST) Received: from mail-bk0-f53.google.com (mail-bk0-f53.google.com [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id CB7CB431FBC for ; Sun, 29 Jan 2012 17:43:26 -0800 (PST) Received: by bke11 with SMTP id 11so938426bke.26 for ; Sun, 29 Jan 2012 17:43:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:in-reply-to:references:user-agent:date :message-id:mime-version:content-type; bh=FfBbOIQNS711ELXh+SpK0tHJQvVtZBHRh2tRw0VIZ+4=; b=g+BnZ/ujfZaAvLC8LS8Q32VLCkYwVDlkjA+4Jhj+2kYBOc7jTd0b0hrBUhgT7DVh3t sWE1ZHgDyyXU8Jhh0jw5XHWkIXIXjHmQY6mEK9R0iAHa4Ei/CiupVa0gw9T4MV8waZZR BDShJkxCiiK3Loe0meTYqlcOU4HbOZ1rvaeIE= Received: by 10.204.154.28 with SMTP id m28mr7563761bkw.54.1327887805387; Sun, 29 Jan 2012 17:43:25 -0800 (PST) Received: from localhost ([91.144.186.21]) by mx.google.com with ESMTPS id sp6sm34046003bkb.2.2012.01.29.17.43.24 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 29 Jan 2012 17:43:24 -0800 (PST) From: Dmitry Kurochkin To: Austin Clements Subject: Re: [PATCH 6/6] emacs: separate history for operations which accept single and multiple tags In-Reply-To: <20120129230229.GI17991@mit.edu> References: <1327725684-5887-1-git-send-email-dmitry.kurochkin@gmail.com> <1327725684-5887-6-git-send-email-dmitry.kurochkin@gmail.com> <20120129230229.GI17991@mit.edu> User-Agent: Notmuch/0.11+134~g7ddba9d (http://notmuchmail.org) Emacs/23.3.1 (x86_64-pc-linux-gnu) Date: Mon, 30 Jan 2012 05:42:15 +0400 Message-ID: <8739ay7yq0.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: notmuch@notmuchmail.org 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: Mon, 30 Jan 2012 01:43:27 -0000 On Sun, 29 Jan 2012 18:02:29 -0500, Austin Clements wrote: > Quoth Dmitry Kurochkin on Jan 28 at 8:41 am: > > Some tag-related operations accept a single tag without prefix > > (`notmuch-select-tag-with-completion'), others accept multiple tags > > prefixed with '+' or '-' (`notmuch-select-tags-with-completion'). > > Before the change, both functions used a single default minibuffer > > history. This is inconvenient because you have to skip options with > > incompatible format when going through the history. The patch adds > > separate history lists for the two functions. Note that functions > > that accept the same input format (e.g. "+", "-", "*") share the > > history list as before. > > --- > > emacs/notmuch.el | 12 ++++++++++-- > > 1 files changed, 10 insertions(+), 2 deletions(-) > > > > diff --git a/emacs/notmuch.el b/emacs/notmuch.el > > index 24b0ea3..9813e0a 100644 > > --- a/emacs/notmuch.el > > +++ b/emacs/notmuch.el > > @@ -76,6 +76,14 @@ For example: > > (defvar notmuch-query-history nil > > "Variable to store minibuffer history for notmuch queries") > > > > +(defvar notmuch-select-tag-history nil > > + "Variable to store notmuch tag history for > > + `notmuch-select-tag-with-completion'.") > > + > > +(defvar notmuch-select-tags-history nil > > + "Variable to store notmuch tags history for > > + `notmuch-select-tags-with-completion'.") > > + > > Really these are minibuffer or input histories, not "notmuch tag > history". Also, the second line shouldn't be indented. (Definitely > nits, but if you roll a new version, you might as well fix these.) > fixed Regards, Dmitry > > (defun notmuch-tag-completions (&optional search-terms) > > (split-string > > (with-output-to-string > > @@ -86,7 +94,7 @@ For example: > > > > (defun notmuch-select-tag-with-completion (prompt &rest search-terms) > > (let ((tag-list (notmuch-tag-completions search-terms))) > > - (completing-read prompt tag-list))) > > + (completing-read prompt tag-list nil nil nil 'notmuch-select-tag-history))) > > > > (defun notmuch-select-tags-with-completion (&optional initial-input &rest search-terms) > > (let* ((add-tag-list (mapcar (apply-partially 'concat "+") > > @@ -105,7 +113,7 @@ For example: > > map))) > > (delete "" (completing-read-multiple > > "Operations (+add -drop): notmuch tag " tag-list nil > > - nil initial-input)))) > > + nil initial-input 'notmuch-select-tags-history)))) > > > > (defun notmuch-update-tags (current-tags changed-tags) > > "Update `current-tags' with `changed-tags' and return the result.