--- /dev/null
+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 389A8429E35\r
+ for <notmuch@notmuchmail.org>; Tue, 22 Oct 2013 17:22:15 -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 ErUFsnXHfZwJ for <notmuch@notmuchmail.org>;\r
+ Tue, 22 Oct 2013 17:22:07 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-4.mit.edu (dmz-mailsec-scanner-4.mit.edu\r
+ [18.9.25.15])\r
+ by olra.theworths.org (Postfix) with ESMTP id 25E79431FBC\r
+ for <notmuch@notmuchmail.org>; Tue, 22 Oct 2013 17:22:07 -0700 (PDT)\r
+X-AuditID: 1209190f-b7fa08e0000009c6-a5-526716ae4fce\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+ by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id CC.A6.02502.EA617625; Tue, 22 Oct 2013 20:22:06 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+ by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id r9N0M5AH027448; \r
+ Tue, 22 Oct 2013 20:22:05 -0400\r
+Received: from drake.dyndns.org\r
+ (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+ [216.15.114.40]) (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 r9N0M3t2005843\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Tue, 22 Oct 2013 20:22:04 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1VYmD5-0008KK-PF; Tue, 22 Oct 2013 20:22:03 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 4/8] emacs: Use interactive specifications for tag changes\r
+ in search\r
+Date: Tue, 22 Oct 2013 20:21:57 -0400\r
+Message-Id: <1382487721-31776-5-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.8.4.rc3\r
+In-Reply-To: <1382487721-31776-1-git-send-email-amdragon@mit.edu>\r
+References: <1382487721-31776-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrDIsWRmVeSWpSXmKPExsUixCmqrbtOLD3IYOk+dYvVc3ksrt+cyezA\r
+ 5LFz1l12j2erbjEHMEVx2aSk5mSWpRbp2yVwZVxe3sVa0KhTcbnlGFMD4w2VLkZODgkBE4mu\r
+ 1Y8ZIWwxiQv31rN1MXJxCAnsY5SYMmcxlLORUeLgldUsEM4dJomfRx5AZeYySvxeupwNpJ9N\r
+ QENi2/7lYLNEBKQldt6dzQpiMws4SnzevwisRlggXKJjWhdYDYuAqsTkv3uBajg4eAUcJGb+\r
+ M4E4Q0li4altYK2cQK1vdnwAaxUCKpmy8wzLBEb+BYwMqxhlU3KrdHMTM3OKU5N1i5MT8/JS\r
+ i3RN9HIzS/RSU0o3MYIDSZJ/B+O3g0qHGAU4GJV4eB+0pAUJsSaWFVfmHmKU5GBSEuVV508P\r
+ EuJLyk+pzEgszogvKs1JLT7EKMHBrCTC2+wLVM6bklhZlVqUD5OS5mBREue9yWEfJCSQnliS\r
+ mp2aWpBaBJOV4eBQkuBlAkaMkGBRanpqRVpmTglCmomDE2Q4D9BwZZAa3uKCxNzizHSI/ClG\r
+ RSlx3jOiQAkBkERGaR5cLyzSXzGKA70izPsMpIoHmCTgul8BDWYCGjxlCcjVxSWJCCmpBsa8\r
+ CPb3D3Ker3YKXbUgTv8gx4dX08P7zfIE3J8UhTy2tZ4gzsu3cUbJ/bo/NvpLgvw3SzFffTxF\r
+ cmnkSu4D73f/nxwxe3Jn/tf9ku5MXH3PuI67LJ1kbzVxykPT518m27E5T2mskPFjO6DOcL36\r
+ iejOz/w1bNW710SaTK/z27WE75/F9E8RS/qVWIozEg21mIuKEwFU8m84zwIAAA==\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: Wed, 23 Oct 2013 00:22:15 -0000\r
+\r
+This is similar to the previous commit, but applies to search.\r
+\r
+Search is somewhat more complicated because its tagging operations can\r
+also apply to a region. Hence, this lifts interactive prompting into\r
+a helper function. This also takes advantage of the new ability to\r
+provide a prompt to distinguish tagging a single thread from tagging a\r
+region of threads.\r
+---\r
+ emacs/notmuch.el | 73 ++++++++++++++++++++++++++++++++++++--------------------\r
+ 1 file changed, 47 insertions(+), 26 deletions(-)\r
+\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index e0511c8..53e9826 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -560,43 +560,62 @@ will be signaled."\r
+ (setq output (append output (notmuch-search-get-tags pos)))))\r
+ output))\r
+ \r
+-(defun notmuch-search-tag-region (beg end &optional tag-changes)\r
+- "Change tags for threads in the given region."\r
++(defun notmuch-search-interactive-region ()\r
++ "Return the bounds of the current interactive region.\r
++\r
++This returns (BEG END), where BEG and END are the bounds of the\r
++region if the region is active, or both `point' otherwise."\r
++ (if (region-active-p)\r
++ (list (region-beginning) (region-end))\r
++ (list (point) (point))))\r
++\r
++(defun notmuch-search-interactive-tag-changes (&optional initial-input)\r
++ "Prompt for tag changes for the current thread or region.\r
++\r
++Returns (TAG-CHANGES REGION-BEGIN REGION-END)."\r
++ (let* ((region (notmuch-search-interactive-region))\r
++ (beg (first region)) (end (second region))\r
++ (prompt (if (= beg end) "Tag thread" "Tag region")))\r
++ (cons (notmuch-read-tag-changes\r
++ (notmuch-search-get-tags-region beg end) prompt initial-input)\r
++ region)))\r
++\r
++(defun notmuch-search-tag (tag-changes &optional beg end)\r
++ "Change tags for the currently selected thread or region.\r
++\r
++See `notmuch-tag' for information on the format of TAG-CHANGES.\r
++When called interactively, this uses the region if the region is\r
++active. When called directly, BEG and END provide the region.\r
++If these are nil or not provided, this applies to the thread at\r
++point."\r
++ (interactive (notmuch-search-interactive-tag-changes))\r
++ (unless (and beg end) (setq beg (point) end (point)))\r
+ (let ((search-string (notmuch-search-find-thread-id-region-search beg end)))\r
+- (setq tag-changes (notmuch-tag search-string tag-changes))\r
++ (notmuch-tag search-string tag-changes)\r
+ (notmuch-search-foreach-result beg end\r
+ (lambda (pos)\r
+ (notmuch-search-set-tags\r
+ (notmuch-update-tags (notmuch-search-get-tags pos) tag-changes)\r
+ pos)))))\r
+ \r
+-(defun notmuch-search-tag (&optional tag-changes)\r
+- "Change tags for the currently selected thread or region.\r
+-\r
+-See `notmuch-tag' for information on the format of TAG-CHANGES."\r
+- (interactive)\r
+- (let* ((beg (if (region-active-p) (region-beginning) (point)))\r
+- (end (if (region-active-p) (region-end) (point))))\r
+- (notmuch-search-tag-region beg end tag-changes)))\r
+-\r
+-(defun notmuch-search-add-tag ()\r
+- "Change tags for the current thread (defaulting to add).\r
++(defun notmuch-search-add-tag (tag-changes &optional beg end)\r
++ "Change tags for the current thread or region (defaulting to add).\r
+ \r
+ Same as `notmuch-search-tag' but sets initial input to '+'."\r
+- (interactive)\r
+- (notmuch-search-tag "+"))\r
++ (interactive (notmuch-search-interactive-tag-changes "+"))\r
++ (notmuch-search-tag tag-changes beg end))\r
+ \r
+-(defun notmuch-search-remove-tag ()\r
+- "Change tags for the current thread (defaulting to remove).\r
++(defun notmuch-search-remove-tag (tag-changes &optional beg end)\r
++ "Change tags for the current thread or region (defaulting to remove).\r
+ \r
+ Same as `notmuch-search-tag' but sets initial input to '-'."\r
+- (interactive)\r
+- (notmuch-search-tag "-"))\r
++ (interactive (notmuch-search-interactive-tag-changes "-"))\r
++ (notmuch-search-tag tag-changes beg end))\r
+ \r
+ (put 'notmuch-search-archive-thread 'notmuch-prefix-doc\r
+ "Un-archive the currently selected thread.")\r
+-(defun notmuch-search-archive-thread (&optional unarchive)\r
+- "Archive the currently selected thread.\r
++(defun notmuch-search-archive-thread (&optional unarchive beg end)\r
++ "Archive the currently selected thread or region.\r
+ \r
+ Archive each message in the currently selected thread by applying\r
+ the tag changes in `notmuch-archive-tags' to each (remove the\r
+@@ -605,10 +624,10 @@ messages will be \"unarchived\" (i.e. the tag changes in\r
+ `notmuch-archive-tags' will be reversed).\r
+ \r
+ This function advances the next thread when finished."\r
+- (interactive "P")\r
++ (interactive (cons current-prefix-arg (notmuch-search-interactive-region)))\r
+ (when notmuch-archive-tags\r
+ (notmuch-search-tag\r
+- (notmuch-tag-change-list notmuch-archive-tags unarchive)))\r
++ (notmuch-tag-change-list notmuch-archive-tags unarchive) beg end))\r
+ (notmuch-search-next-thread))\r
+ \r
+ (defun notmuch-search-update-result (result &optional pos)\r
+@@ -832,11 +851,13 @@ non-authors is found, assume that all of the authors match."\r
+ (notmuch-sexp-parse-partial-list 'notmuch-search-show-result\r
+ results-buf)))))\r
+ \r
+-(defun notmuch-search-tag-all (&optional tag-changes)\r
++(defun notmuch-search-tag-all (tag-changes)\r
+ "Add/remove tags from all messages in current search buffer.\r
+ \r
+ See `notmuch-tag' for information on the format of TAG-CHANGES."\r
+- (interactive)\r
++ (interactive\r
++ (list (notmuch-read-tag-changes\r
++ (notmuch-search-get-tags-region (point-min) (point-max)) "Tag all")))\r
+ (notmuch-tag notmuch-search-query-string tag-changes))\r
+ \r
+ (defun notmuch-search-buffer-title (query)\r
+-- \r
+1.8.4.rc3\r
+\r
projects / notmuch-archives.git / commitdiff