[PATCH 8/8] emacs: Remove interactive behavior of `notmuch-tag'

diff --git a/84/d1be446fd816530ac3568fd9aa6e0df35da0e9 b/84/d1be446fd816530ac3568fd9aa6e0df35da0e9
new file mode 100644 (file)
index 0000000..c69b3ee
--- /dev/null
+++ b/84/d1be446fd816530ac3568fd9aa6e0df35da0e9
@@ -0,0 +1,128 @@
+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 5EE4D431FD7\r
+       for <notmuch@notmuchmail.org>; Tue, 22 Oct 2013 12:51:44 -0700 (PDT)\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 VRtnyINUNm3z for <notmuch@notmuchmail.org>;\r
+       Tue, 22 Oct 2013 12:51:39 -0700 (PDT)\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 A16C1429E31\r
+       for <notmuch@notmuchmail.org>; Tue, 22 Oct 2013 12:51:15 -0700 (PDT)\r
+X-AuditID: 12074425-b7f1c8e0000009c7-b7-5266d7337377\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+       by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 72.C5.02503.337D6625; Tue, 22 Oct 2013 15:51:15 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+       by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id r9MJp3Y9016701; \r
+       Tue, 22 Oct 2013 15:51:04 -0400\r
+Received: from drake.dyndns.org (31-33-57.wireless.csail.mit.edu\r
+       [128.31.33.57]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id r9MJp1Oo005204\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Tue, 22 Oct 2013 15:51:03 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1VYhyn-0006yv-6t; Tue, 22 Oct 2013 15:51:01 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 8/8] emacs: Remove interactive behavior of `notmuch-tag'\r
+Date: Tue, 22 Oct 2013 15:50:57 -0400\r
+Message-Id: <1382471457-26056-9-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.8.4.rc3\r
+In-Reply-To: <1382471457-26056-1-git-send-email-amdragon@mit.edu>\r
+References: <1382471457-26056-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrIIsWRmVeSWpSXmKPExsUixG6nomt8PS3I4MRaQYvrN2cyOzB6PFt1\r
+       izmAMYrLJiU1J7MstUjfLoErY8OCX2wFp4QrPk94z9TA+J2/i5GTQ0LARGLl9DmMELaYxIV7\r
+       69m6GLk4hAT2MUrsnbCSGcLZyCixdc5iFgjnGJPEyScvmCCcuYwS27c/ZALpZxPQkNi2fznY\r
+       LBEBaYmdd2ezdjFycDALqEn86VIBCQsLeEise7eLBcRmEVCVuLpzNRNICa+Ag8SXSeoQVyhJ\r
+       LDy1jRXE5hRwlJi+7x8bSIkQUMmpOxwTGPkXMDKsYpRNya3SzU3MzClOTdYtTk7My0st0rXQ\r
+       y80s0UtNKd3ECA4ZF9UdjBMOKR1iFOBgVOLhfdCSFiTEmlhWXJl7iFGSg0lJlDfiKlCILyk/\r
+       pTIjsTgjvqg0J7X4EKMEB7OSCG+zL1CONyWxsiq1KB8mJc3BoiTOe4vDPkhIID2xJDU7NbUg\r
+       tQgmK8PBoSTBK3QNqFGwKDU9tSItM6cEIc3EwQkynAdo+DGQxbzFBYm5xZnpEPlTjIpS4rzC\r
+       IM0CIImM0jy4XlhMv2IUB3pFmJcTpIoHmA7gul8BDWYCGjxlCdjgkkSElFQD48JK1dTt0umc\r
+       wjVH98TPenfELfxFstWbl9O6zaPCRL3amnawR049VTX7u2TlmkXbbgUHrNxlaC+Tfdy7/+SB\r
+       xc4c3+bN11IxT7T9kJz472bxrbXp/ws3iGhHxLv3SO4sNtuQzlL5dfpXF+3XM17ffrpNJ1fh\r
+       lebhtfVWcb9/bf8Q/eR6+wprDyWW4oxEQy3mouJEAL+V/XrEAgAA\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: Tue, 22 Oct 2013 19:51:44 -0000\r
+\r
+We no longer use this, since we've lifted all interactive behavior to\r
+the appropriate interactive entry points.  Because of this,\r
+`notmuch-tag' also no longer needs to return the tag changes list,\r
+since the caller always passes it in.\r
+---\r
+ emacs/notmuch-tag.el | 19 ++++---------------\r
+ 1 file changed, 4 insertions(+), 15 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-tag.el b/emacs/notmuch-tag.el\r
+index f9c1740..feee17c 100644\r
+--- a/emacs/notmuch-tag.el\r
++++ b/emacs/notmuch-tag.el\r
+@@ -249,27 +249,18 @@ from TAGS if present."\r
+          (error "Changed tag must be of the form `+this_tag' or `-that_tag'")))))\r
+     (sort result-tags 'string<)))\r
+ \r
+-(defun notmuch-tag (query &optional tag-changes)\r
++(defun notmuch-tag (query tag-changes)\r
+   "Add/remove tags in TAG-CHANGES to messages matching QUERY.\r
+ \r
+ QUERY should be a string containing the search-terms.\r
+-TAG-CHANGES can take multiple forms.  If TAG-CHANGES is a list of\r
+-strings of the form \"+tag\" or \"-tag\" then those are the tag\r
+-changes applied.  If TAG-CHANGES is a string then it is\r
+-interpreted as a single tag change.  If TAG-CHANGES is the string\r
+-\"-\" or \"+\", or null, then the user is prompted to enter the\r
+-tag changes.\r
++TAG-CHANGES is a list of strings of the form \"+tag\" or\r
++\"-tag\" to add or remove tags, respectively.\r
+ \r
+ Note: Other code should always use this function alter tags of\r
+ messages instead of running (notmuch-call-notmuch-process \"tag\" ..)\r
+ directly, so that hooks specified in notmuch-before-tag-hook and\r
+ notmuch-after-tag-hook will be run."\r
+   ;; Perform some validation\r
+-  (if (string-or-null-p tag-changes)\r
+-      (if (or (string= tag-changes "-") (string= tag-changes "+") (null tag-changes))\r
+-        (setq tag-changes (notmuch-read-tag-changes\r
+-                           (notmuch-tag-completions query) nil tag-changes))\r
+-      (setq tag-changes (list tag-changes))))\r
+   (mapc (lambda (tag-change)\r
+         (unless (string-match-p "^[-+]\\S-+$" tag-change)\r
+           (error "Tag must be of the form `+this_tag' or `-that_tag'")))\r
+@@ -278,9 +269,7 @@ notmuch-after-tag-hook will be run."\r
+     (run-hooks 'notmuch-before-tag-hook)\r
+     (apply 'notmuch-call-notmuch-process "tag"\r
+          (append tag-changes (list "--" query)))\r
+-    (run-hooks 'notmuch-after-tag-hook))\r
+-  ;; in all cases we return tag-changes as a list\r
+-  tag-changes)\r
++    (run-hooks 'notmuch-after-tag-hook)))\r
+ \r
+ (defun notmuch-tag-change-list (tags &optional reverse)\r
+   "Convert TAGS into a list of tag changes.\r
+-- \r
+1.8.4.rc3\r
+\r