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

diff --git a/bb/28fe3ed32d95dd2bf646631a674a58a6f78c0d b/bb/28fe3ed32d95dd2bf646631a674a58a6f78c0d
new file mode 100644 (file)
index 0000000..69cd9b0
--- /dev/null
+++ b/bb/28fe3ed32d95dd2bf646631a674a58a6f78c0d
@@ -0,0 +1,112 @@
+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 3EA9A431FBC\r
+       for <notmuch@notmuchmail.org>; Fri, 27 Jan 2012 20:42:52 -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 jtmPsmEs0qhf for <notmuch@notmuchmail.org>;\r
+       Fri, 27 Jan 2012 20:42:51 -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 13716431FD6\r
+       for <notmuch@notmuchmail.org>; Fri, 27 Jan 2012 20:42:41 -0800 (PST)\r
+Received: by mail-bk0-f53.google.com with SMTP id zt19so2255515bkb.26\r
+       for <notmuch@notmuchmail.org>; Fri, 27 Jan 2012 20:42:41 -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=r4I6h0mr3Myu6qCDKlGpxaLIAf6a0DVhKJQcJez/elI=;\r
+       b=wJQDmFi36s7lKMxrZ/cMBINSsIBdrvFO64qYQ/93IosUmmW4Kjw5KrZ7ACkcKOp7hs\r
+       He6aV7Wves8jQPRTKE2scxYJT/3p3ZZyX65ZqR9NxOrYxSsjKIeaeFH+YNEe3X/A6f9V\r
+       V/qvi2vmFfxsachM3nifmdTKVvn094HL3tCVM=\r
+Received: by 10.204.157.25 with SMTP id z25mr4294521bkw.25.1327725761792;\r
+       Fri, 27 Jan 2012 20:42:41 -0800 (PST)\r
+Received: from localhost ([91.144.186.21])\r
+       by mx.google.com with ESMTPS id bw9sm20679266bkb.8.2012.01.27.20.42.40\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Fri, 27 Jan 2012 20:42:41 -0800 (PST)\r
+From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 6/6] emacs: separate history for operations which accept\r
+       single and multiple tags\r
+Date: Sat, 28 Jan 2012 08:41:24 +0400\r
+Message-Id: <1327725684-5887-6-git-send-email-dmitry.kurochkin@gmail.com>\r
+X-Mailer: git-send-email 1.7.8.3\r
+In-Reply-To: <1327725684-5887-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+References: <1327725684-5887-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: Sat, 28 Jan 2012 04:42:52 -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-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
+ (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
+-- \r
+1.7.8.3\r
+\r