--- /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 CFA14431FBF\r
+ for <notmuch@notmuchmail.org>; Tue, 22 Oct 2013 17:22:42 -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 SjPu9ujcn4EZ for <notmuch@notmuchmail.org>;\r
+ Tue, 22 Oct 2013 17:22:37 -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 B8A6F431FBC\r
+ for <notmuch@notmuchmail.org>; Tue, 22 Oct 2013 17:22:16 -0700 (PDT)\r
+X-AuditID: 1209190f-b7fa08e0000009c6-c9-526716b84dd7\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+ by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 4E.A6.02502.8B617625; Tue, 22 Oct 2013 20:22:16 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+ by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id r9N0M5gb017164; \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 r9N0M3XF005841\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-0008KI-Nt; Tue, 22 Oct 2013 20:22:03 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 3/8] emacs: Use interactive specifications for tag changes\r
+ in show\r
+Date: Tue, 22 Oct 2013 20:21:56 -0400\r
+Message-Id: <1382487721-31776-4-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+NgFtrDIsWRmVeSWpSXmKPExsUixG6nrrtDLD3IoHm7kMXquTwW12/OZHZg\r
+ 8tg56y67x7NVt5gDmKK4bFJSczLLUov07RK4Mt6sNCs4JlNx4MdDtgbGJ+JdjJwcEgImEpMn\r
+ 3WGBsMUkLtxbz9bFyMUhJLCPUeLE8i1QzkZGib7/HewQzh0miYuTjkE5cxkldvfvYAfpZxPQ\r
+ kNi2fzkjiC0iIC2x8+5sVhCbWcBR4vP+RWwgtrBAqMTUzTPB9rEIqEos/f8NrJ5XwEHiw6/p\r
+ UHcoSSw8tQ2slxOo982OD2C9QkA1U3aeYZnAyL+AkWEVo2xKbpVubmJmTnFqsm5xcmJeXmqR\r
+ rolebmaJXmpK6SZGUCBxSvLvYPx2UOkQowAHoxIP74OWtCAh1sSy4srcQ4ySHExKorzq/OlB\r
+ QnxJ+SmVGYnFGfFFpTmpxYcYJTiYlUR4m32BynlTEiurUovyYVLSHCxK4rw3OeyDhATSE0tS\r
+ s1NTC1KLYLIyHBxKErxMwIgREixKTU+tSMvMKUFIM3FwggznARquDFLDW1yQmFucmQ6RP8Wo\r
+ KCXOe0YUKCEAksgozYPrhUX6K0ZxoFeEeZ+BVPEAkwRc9yugwUxAg6csAbm6uCQRISXVwKj9\r
+ q2fTqpm/mY67pyp26Jcz/5C2LXXaxvDU5N5RVtlPeqd+OzoXvzpz7mbRkYykedOs+Zok7LV+\r
+ /cssjD+xrCJ11wWlFa+X99wxEn5xv8/7o+Xctrl7d69imKSY9sU5IedB6xMNX6mJStdnMj1+\r
+ 550Za+BQl7W9o1CSXeYpn24/Y2Xy3sv3W5RYijMSDbWYi4oTAUgxkkTPAgAA\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:43 -0000\r
+\r
+This modifies all tagging operations in show to call\r
+`notmuch-read-tag-changes' in their interactive specification to input\r
+tag changes, rather than depending on lower-level functions to prompt\r
+for tag changes regardless of their calling context.\r
+\r
+Besides being more Elispy and providing a more consistent programmatic\r
+API, this enables callers to provide two call site-specific pieces of\r
+information: an appropriate prompt, and the set of visible tags. The\r
+prompt lets us differentiate * from +/-. Providing visible tags\r
+enables a more consistent user experience than retrieving the\r
+(potentially different) tags from the database, and avoids a\r
+round-trip to the CLI and database.\r
+---\r
+ emacs/notmuch-show.el | 33 ++++++++++++++++++++-------------\r
+ 1 file changed, 20 insertions(+), 13 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 7325792..f66d669 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -1780,23 +1780,28 @@ TAG-CHANGES is a list of tag operations for `notmuch-tag'."\r
+ (notmuch-tag (notmuch-show-get-message-id) tag-changes)\r
+ (notmuch-show-set-tags new-tags))))\r
+ \r
+-(defun notmuch-show-tag (&optional tag-changes)\r
++(defun notmuch-show-tag (tag-changes)\r
+ "Change tags for the current message.\r
+ \r
+ See `notmuch-tag' for information on the format of TAG-CHANGES."\r
+- (interactive)\r
+- (let* ((tag-changes (notmuch-tag (notmuch-show-get-message-id) tag-changes))\r
+- (current-tags (notmuch-show-get-tags))\r
++ (interactive (list (notmuch-read-tag-changes (notmuch-show-get-tags)\r
++ "Tag message")))\r
++ (notmuch-tag (notmuch-show-get-message-id) tag-changes)\r
++ (let* ((current-tags (notmuch-show-get-tags))\r
+ (new-tags (notmuch-update-tags current-tags tag-changes)))\r
+ (unless (equal current-tags new-tags)\r
+ (notmuch-show-set-tags new-tags))))\r
+ \r
+-(defun notmuch-show-tag-all (&optional tag-changes)\r
++(defun notmuch-show-tag-all (tag-changes)\r
+ "Change tags for all messages in the current show buffer.\r
+ \r
+ See `notmuch-tag' for information on the format of TAG-CHANGES."\r
+- (interactive)\r
+- (setq tag-changes (notmuch-tag (notmuch-show-get-messages-ids-search) tag-changes))\r
++ (interactive\r
++ (list (let (tags)\r
++ (notmuch-show-mapc\r
++ (lambda () (setq tags (append (notmuch-show-get-tags) tags))))\r
++ (notmuch-read-tag-changes tags "Tag thread"))))\r
++ (notmuch-tag (notmuch-show-get-messages-ids-search) tag-changes)\r
+ (notmuch-show-mapc\r
+ (lambda ()\r
+ (let* ((current-tags (notmuch-show-get-tags))\r
+@@ -1804,19 +1809,21 @@ See `notmuch-tag' for information on the format of TAG-CHANGES."\r
+ (unless (equal current-tags new-tags)\r
+ (notmuch-show-set-tags new-tags))))))\r
+ \r
+-(defun notmuch-show-add-tag ()\r
++(defun notmuch-show-add-tag (tag-changes)\r
+ "Change tags for the current message (defaulting to add).\r
+ \r
+ Same as `notmuch-show-tag' but sets initial input to '+'."\r
+- (interactive)\r
+- (notmuch-show-tag "+"))\r
++ (interactive\r
++ (list (notmuch-read-tag-changes (notmuch-show-get-tags) "Tag message" "+")))\r
++ (notmuch-show-tag tag-changes))\r
+ \r
+-(defun notmuch-show-remove-tag ()\r
++(defun notmuch-show-remove-tag (tag-changes)\r
+ "Change tags for the current message (defaulting to remove).\r
+ \r
+ Same as `notmuch-show-tag' but sets initial input to '-'."\r
+- (interactive)\r
+- (notmuch-show-tag "-"))\r
++ (interactive\r
++ (list (notmuch-read-tag-changes (notmuch-show-get-tags) "Tag message" "-")))\r
++ (notmuch-show-tag tag-changes))\r
+ \r
+ (defun notmuch-show-toggle-visibility-headers ()\r
+ "Toggle the visibility of the current message headers."\r
+-- \r
+1.8.4.rc3\r
+\r
projects / notmuch-archives.git / commitdiff