[PATCH v2 08/13] emacs: separate history for operations which accept single and multi...

diff --git a/09/c46a581841186e3a40effceaf2f556d203ddb7 b/09/c46a581841186e3a40effceaf2f556d203ddb7
new file mode 100644 (file)
index 0000000..b143e6b
--- /dev/null
+++ b/09/c46a581841186e3a40effceaf2f556d203ddb7
@@ -0,0 +1,114 @@
+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 77204429E52\r
+       for <notmuch@notmuchmail.org>; Sun, 29 Jan 2012 18:28:02 -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 bI2xY5EvWP-J for <notmuch@notmuchmail.org>;\r
+       Sun, 29 Jan 2012 18:28:01 -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 3919E429E5B\r
+       for <notmuch@notmuchmail.org>; Sun, 29 Jan 2012 18:27:51 -0800 (PST)\r
+Received: by mail-bk0-f53.google.com with SMTP id 11so960260bke.26\r
+       for <notmuch@notmuchmail.org>; Sun, 29 Jan 2012 18:27:51 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
+       h=from:to:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=gAlKgeckCO9dksbWIHV8TRRa5OpPO7JH2qsf2d2H2w0=;\r
+       b=csP8Mc+PbxwngnkatySnGIhq6erXBusBdiKAwBVfmejTUtmbcKJ4GvNqHGQDG1ti38\r
+       YQyKCfdc9YEK8qLGwxCqwqUXiqRUSQOshMwCobJIeT18F2NtUBAE2snqlqtYNbmywgqo\r
+       3PuiBbmx//dq6oKU/AJfh+lW6Gr77wWe7QEGM=\r
+Received: by 10.205.131.13 with SMTP id ho13mr7829154bkc.58.1327890470974;\r
+       Sun, 29 Jan 2012 18:27:50 -0800 (PST)\r
+Received: from localhost ([91.144.186.21])\r
+       by mx.google.com with ESMTPS id o26sm28043469bko.14.2012.01.29.18.27.50\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sun, 29 Jan 2012 18:27:50 -0800 (PST)\r
+From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 08/13] emacs: separate history for operations which accept\r
+       single and multiple tags\r
+Date: Mon, 30 Jan 2012 06:26:17 +0400\r
+Message-Id: <1327890382-548-9-git-send-email-dmitry.kurochkin@gmail.com>\r
+X-Mailer: git-send-email 1.7.8.3\r
+In-Reply-To: <1327890382-548-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+References: <1327725684-5887-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+       <1327890382-548-1-git-send-email-dmitry.kurochkin@gmail.com>\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 02:28:03 -0000\r
+\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-read-tag-changes').  Before the\r
+change, both functions used a single default minibuffer history.  This\r
+is inconvenient because you have to skip options with incompatible\r
+format when going through the history.  The patch adds separate\r
+history lists for the two functions.  Note that functions that accept\r
+the same input format (e.g. "+", "-", "*") share the history list as\r
+before.\r
+---\r
+ emacs/notmuch.el |   13 +++++++++++--\r
+ 1 files changed, 11 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index 90627dc..5adcac5 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 minibuffer history for\r
++`notmuch-select-tag-with-completion' function.")\r
++\r
++(defvar notmuch-read-tag-changes-history nil\r
++  "Variable to store minibuffer history for\r
++`notmuch-read-tag-changes' function.")\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-read-tag-changes (&optional initial-input &rest search-terms)\r
+   (let* ((all-tag-list (notmuch-tag-completions))\r
+@@ -106,7 +114,8 @@ For example:\r
+           (define-key map " " 'self-insert-command)\r
+           map)))\r
+     (delete "" (completing-read-multiple "Tags (+add -drop): "\r
+-              tag-list nil nil initial-input))))\r
++              tag-list nil nil initial-input\r
++              'notmuch-read-tag-changes-history))))\r
+ \r
+ (defun notmuch-update-tags (tags tag-changes)\r
+   "Return a copy of TAGS with additions and removals from TAG-CHANGES.\r
+-- \r
+1.7.8.3\r
+\r