[PATCH v2] emacs: add completion to "tag all" operation ("*" binding)

diff --git a/da/3e3f54dfe2c6236292419aa3f61dc4e7d6302b b/da/3e3f54dfe2c6236292419aa3f61dc4e7d6302b
new file mode 100644 (file)
index 0000000..38af7d4
--- /dev/null
+++ b/da/3e3f54dfe2c6236292419aa3f61dc4e7d6302b
@@ -0,0 +1,153 @@
+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 8B9BF429E36\r
+       for <notmuch@notmuchmail.org>; Wed, 25 Jan 2012 17:27:42 -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 RuO7CbP5X9Jw for <notmuch@notmuchmail.org>;\r
+       Wed, 25 Jan 2012 17:27:41 -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 A61BE431FBC\r
+       for <notmuch@notmuchmail.org>; Wed, 25 Jan 2012 17:27:41 -0800 (PST)\r
+Received: by bkbzt19 with SMTP id zt19so47449bkb.26\r
+       for <notmuch@notmuchmail.org>; Wed, 25 Jan 2012 17:27:40 -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=c7W7zR09RLIxlkJR8yK5He/WUVJ6lXceNk3DHrrwEYE=;\r
+       b=j+BV8lQrOEvWWtxeoHsLjtQo6FKt/ji/P2SVWmXbwxjvSc9Z3kxeU7qumPPq91fFjI\r
+       W8f4dddzezR2SH30b6xKR4Cpz5+JnXm6jr8zbOnv+isUmZ5vNIWTQwI/hzdcIqeSqzur\r
+       sJggDfbd+b7g/LUZrfIU2JZm+RhxSv5JvjkIs=\r
+Received: by 10.204.150.81 with SMTP id x17mr29879bkv.27.1327541260311;\r
+       Wed, 25 Jan 2012 17:27:40 -0800 (PST)\r
+Received: from localhost ([91.144.186.21])\r
+       by mx.google.com with ESMTPS id iu2sm5094284bkb.0.2012.01.25.17.27.39\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Wed, 25 Jan 2012 17:27:39 -0800 (PST)\r
+From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2] emacs: add completion to "tag all" operation ("*" binding)\r
+Date: Thu, 26 Jan 2012 05:26:34 +0400\r
+Message-Id: <1327541194-9722-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+X-Mailer: git-send-email 1.7.8.3\r
+In-Reply-To: <1327540351-5249-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+References: <1327540351-5249-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: Thu, 26 Jan 2012 01:27:42 -0000\r
+\r
+The patch adds <tab> completion to "tag all" operation bound to "*"\r
+(`notmuch-search-operate-all' function).\r
+---\r
+\r
+Changes in v2:\r
+\r
+* s/thistag/this_tag/ for consistency with "that_tag", since we touch\r
+  the line anyway\r
+\r
+Regards,\r
+  Dmitry\r
+\r
+ emacs/notmuch.el |   48 ++++++++++++++++++++++++++++++++++++------------\r
+ 1 files changed, 36 insertions(+), 12 deletions(-)\r
+\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index e02966f..a57bf70 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -48,6 +48,7 @@\r
+ ;; required, but is available from http://notmuchmail.org).\r
+ \r
+ (eval-when-compile (require 'cl))\r
++(require 'crm)\r
+ (require 'mm-view)\r
+ (require 'message)\r
+ \r
+@@ -75,12 +76,33 @@ For example:\r
+ (defvar notmuch-query-history nil\r
+   "Variable to store minibuffer history for notmuch queries")\r
+ \r
+-(defun notmuch-select-tag-with-completion (prompt &rest search-terms)\r
++(defun notmuch-tag-completions (&optional search-terms prefixes)\r
+   (let ((tag-list\r
+        (with-output-to-string\r
+          (with-current-buffer standard-output\r
+            (apply 'call-process notmuch-command nil t nil "search-tags" search-terms)))))\r
+-    (completing-read prompt (split-string tag-list "\n+" t) nil nil nil)))\r
++    (setq tag-list (split-string tag-list "\n+" t))\r
++    (if (null prefixes)\r
++      tag-list\r
++      (apply #'append\r
++           (mapcar (lambda (tag)\r
++                     (mapcar (lambda (prefix)\r
++                               (concat prefix tag)) prefixes))\r
++                   tag-list)))))\r
++\r
++(defun notmuch-select-tag-with-completion (prompt &optional search-terms prefixes)\r
++  (let ((tag-list (notmuch-tag-completions search-terms prefixes)))\r
++    (completing-read prompt tag-list)))\r
++\r
++(defun notmuch-select-tags-with-completion (prompt &optional search-terms prefixes)\r
++  (let ((tag-list (notmuch-tag-completions search-terms prefixes))\r
++      (crm-separator " ")\r
++      (crm-local-completion-map (copy-keymap crm-local-completion-map)))\r
++    ;; By default, space is bound to "complete word" function.\r
++    ;; Re-bind it to insert a space instead.  Note that <tab> still\r
++    ;; does the completion.\r
++    (define-key crm-local-completion-map " " 'self-insert-command)\r
++    (completing-read-multiple prompt tag-list)))\r
+ \r
+ (defun notmuch-foreach-mime-part (function mm-handle)\r
+   (cond ((stringp (car mm-handle))\r
+@@ -860,16 +882,18 @@ will prompt for tags to be added or removed. Tags prefixed with\r
+ Each character of the tag name may consist of alphanumeric\r
+ characters as well as `_.+-'.\r
+ "\r
+-  (interactive "sOperation (+add -drop): notmuch tag ")\r
+-  (let ((action-split (split-string action " +")))\r
+-    ;; Perform some validation\r
+-    (let ((words action-split))\r
+-      (when (null words) (error "No operation given"))\r
+-      (while words\r
+-      (unless (string-match-p "^[-+][-+_.[:word:]]+$" (car words))\r
+-        (error "Action must be of the form `+thistag -that_tag'"))\r
+-      (setq words (cdr words))))\r
+-    (apply 'notmuch-tag notmuch-search-query-string action-split)))\r
++  (interactive (list (notmuch-select-tags-with-completion\r
++                    "Operation (+add -drop): notmuch tag " nil\r
++                    '("+" "-"))))\r
++  (setq action (delete "" action))\r
++  ;; Perform some validation\r
++  (let ((words action))\r
++    (when (null words) (error "No operation given"))\r
++    (while words\r
++      (unless (string-match-p "^[-+][-+_.[:word:]]+$" (car words))\r
++      (error "Action must be of the form `+this_tag -that_tag'"))\r
++      (setq words (cdr words))))\r
++  (apply 'notmuch-tag notmuch-search-query-string action))\r
+ \r
+ (defun notmuch-search-buffer-title (query)\r
+   "Returns the title for a buffer with notmuch search results."\r
+-- \r
+1.7.8.3\r
+\r