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

diff --git a/b6/8564f491c35a02d7463171259ce6f4de9e4a11 b/b6/8564f491c35a02d7463171259ce6f4de9e4a11
new file mode 100644 (file)
index 0000000..1faad70
--- /dev/null
+++ b/b6/8564f491c35a02d7463171259ce6f4de9e4a11
@@ -0,0 +1,134 @@
+Return-Path: <amdragon@mit.edu>\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 51BCF431E64\r
+       for <notmuch@notmuchmail.org>; Sun, 29 Jan 2012 15:03:20 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[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 aV2Kvyi+RVyy for <notmuch@notmuchmail.org>;\r
+       Sun, 29 Jan 2012 15:03:19 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU\r
+       [18.7.68.37])\r
+       by olra.theworths.org (Postfix) with ESMTP id B6F8D429E4C\r
+       for <notmuch@notmuchmail.org>; Sun, 29 Jan 2012 15:03:19 -0800 (PST)\r
+X-AuditID: 12074425-b7f4a6d0000008e0-b3-4f25d0371852\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+       by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 40.BD.02272.730D52F4; Sun, 29 Jan 2012 18:03:19 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q0TN3I1x023922; \r
+       Sun, 29 Jan 2012 18:03:19 -0500\r
+Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
+       (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q0TN3HoV022913\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sun, 29 Jan 2012 18:03:18 -0500 (EST)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1RrdlV-000086-MR; Sun, 29 Jan 2012 18:02:29 -0500\r
+Date: Sun, 29 Jan 2012 18:02:29 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
+Subject: Re: [PATCH 6/6] emacs: separate history for operations which accept\r
+       single and multiple tags\r
+Message-ID: <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
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+In-Reply-To: <1327725684-5887-6-git-send-email-dmitry.kurochkin@gmail.com>\r
+User-Agent: Mutt/1.5.21 (2010-09-15)\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFmplleLIzCtJLcpLzFFi42IR4hTV1jW/oOpv0PFR1OLq1n52i+s3ZzI7\r
+       MHnsnHWX3ePZqlvMAUxRXDYpqTmZZalF+nYJXBkHrl1mLVgiXLHzbwNzA+Mz/i5GTg4JAROJ\r
+       mw0P2SBsMYkL99YD2VwcQgL7GCUaHl5ignA2MEocbP8KlTnJJHFndwcLhLOEUaJ3xVVmkH4W\r
+       AVWJf8fXgdlsAhoS2/YvZwSxRQQMJW5dfAUWZxaQlvj2u5kJxBYWSJfoePwRLM4roCNx8eob\r
+       RoihnYwS8/Z3skMkBCVOznzCAtGsJXHj30ugZg6wQcv/cYCEOQW8JN7PXQY2U1RARWLKyW1s\r
+       ExiFZiHpnoWkexZC9wJG5lWMsim5Vbq5iZk5xanJusXJiXl5qUW6Fnq5mSV6qSmlmxhBoc3u\r
+       orqDccIhpUOMAhyMSjy8OytU/YVYE8uKK3MPMUpyMCmJ8racAQrxJeWnVGYkFmfEF5XmpBYf\r
+       YpTgYFYS4Z2zDCjHm5JYWZValA+TkuZgURLn1dR65yckkJ5YkpqdmlqQWgSTleHgUJLgnXse\r
+       qFGwKDU9tSItM6cEIc3EwQkynAdo+H6QGt7igsTc4sx0iPwpRkUpcd5GkIQASCKjNA+uF5Z6\r
+       XjGKA70izNsEUsUDTFtw3a+ABjMBDX7OADa4JBEhJdXAOKVQbMKejVnZcx7Hcczb+e+0+foJ\r
+       x2z2cCau02pfNLv9l1F3zKp4XrH9k6otHI5OtznyZl/r57YC3SU73i7J2RS1c+nHpO159ops\r
+       z2uiJJsvr7l/69mhfLPv1TcXLgq3+PZqi45q4da3NyUvq4b1LXmetmHh3snJk5vl1zJEsr2Q\r
+       C07gL99bIafEUpyRaKjFXFScCAAOml0aGAMAAA==\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: Sun, 29 Jan 2012 23:03:20 -0000\r
+\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
+>  (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