Re: [PATCH 6/6] emacs: separate history for operations which accept single and multip...

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