[PATCH 3/6] emacs: modify notmuch-search-tag to not prompt if tags provided as argument

diff --git a/ed/c596e0448f8875dacfd2cbf1b8e9c980910d8b b/ed/c596e0448f8875dacfd2cbf1b8e9c980910d8b
new file mode 100644 (file)
index 0000000..0f6fa7e
--- /dev/null
+++ b/ed/c596e0448f8875dacfd2cbf1b8e9c980910d8b
@@ -0,0 +1,98 @@
+Return-Path: <jrollins@finestructure.net>\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 5EBCC431FC2\r
+       for <notmuch@notmuchmail.org>; Mon,  2 Apr 2012 01:21:02 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] 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 fplpA12xpdVs for <notmuch@notmuchmail.org>;\r
+       Mon,  2 Apr 2012 01:21:01 -0700 (PDT)\r
+Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu\r
+       [131.215.239.19])\r
+       by olra.theworths.org (Postfix) with ESMTP id 0A9A7431FD6\r
+       for <notmuch@notmuchmail.org>; Mon,  2 Apr 2012 01:21:01 -0700 (PDT)\r
+Received: from earth-doxen.imss.caltech.edu (localhost [127.0.0.1])\r
+       by earth-doxen-postvirus (Postfix) with ESMTP id C10B966E00EF\r
+       for <notmuch@notmuchmail.org>; Mon,  2 Apr 2012 01:20:58 -0700 (PDT)\r
+X-Spam-Scanned: at Caltech-IMSS on earth-doxen by amavisd-new\r
+Received: from finestructure.net (unknown [76.89.193.65])\r
+       (Authenticated sender: jrollins)\r
+       by earth-doxen-submit (Postfix) with ESMTP id EBDB966E00E4\r
+       for <notmuch@notmuchmail.org>; Mon,  2 Apr 2012 01:20:56 -0700 (PDT)\r
+Received: by finestructure.net (Postfix, from userid 1000)\r
+       id 94FF019C4; Mon,  2 Apr 2012 01:20:56 -0700 (PDT)\r
+From: Jameson Graef Rollins <jrollins@finestructure.net>\r
+To: Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: [PATCH 3/6] emacs: modify notmuch-search-tag to not prompt if tags\r
+       provided as argument\r
+Date: Mon,  2 Apr 2012 01:20:50 -0700\r
+Message-Id: <1333354853-25729-4-git-send-email-jrollins@finestructure.net>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1333354853-25729-3-git-send-email-jrollins@finestructure.net>\r
+References: <1333354853-25729-1-git-send-email-jrollins@finestructure.net>\r
+       <1333354853-25729-2-git-send-email-jrollins@finestructure.net>\r
+       <1333354853-25729-3-git-send-email-jrollins@finestructure.net>\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, 02 Apr 2012 08:21:02 -0000\r
+\r
+If the argument is a full string or a list, the function will assume\r
+this is a tag string or list and will not prompt the user.  If the\r
+argument is nil or the exact strings "-" or "+" then the user will be\r
+prompted.\r
+\r
+The function doc is updated accordingly.\r
+---\r
+ emacs/notmuch.el |   16 ++++++++++++----\r
+ 1 files changed, 12 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index 0ab8fc2..3b78584 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -646,13 +646,21 @@ added or removed for all threads in the region from BEG to END."\r
+          (notmuch-update-tags (notmuch-search-get-tags) tag-changes))\r
+         (forward-line))))))\r
+ \r
+-(defun notmuch-search-tag (&optional initial-input)\r
+-  "Change tags for the currently selected thread or region."\r
++(defun notmuch-search-tag (&optional tags)\r
++  "Change tags for the currently selected thread or region.\r
++\r
++If TAGS is a string or list it will be interpreted as tags to\r
++apply to the selected messages.  If TAGS is nil or either of the\r
++strings `-' or `+' the user will be prompted to enter tags (with\r
++tab completion)."\r
+   (interactive)\r
+   (let* ((beg (if (region-active-p) (region-beginning) (point)))\r
+        (end (if (region-active-p) (region-end) (point)))\r
+-       (search-string (notmuch-search-find-thread-id-region-search beg end))\r
+-       (tags (notmuch-read-tag-changes initial-input search-string)))\r
++       (search-string (notmuch-search-find-thread-id-region-search beg end)))\r
++    (if (string-or-null-p tags)\r
++      (if (or (string= tags "-") (string= tags "+") (eq tags nil))\r
++          (setq tags (notmuch-read-tag-changes tags search-string))\r
++        (setq tags (list tags))))\r
+     (apply 'notmuch-search-tag-region beg end tags)))\r
+ \r
+ (defun notmuch-search-add-tag ()\r
+-- \r
+1.7.9.1\r
+\r