--- /dev/null
+Return-Path: <pieter@praet.org>\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 C1276416017\r
+ for <notmuch@notmuchmail.org>; Fri, 24 Feb 2012 14:33:33 -0800 (PST)\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 yNo0EdQbYeNz for <notmuch@notmuchmail.org>;\r
+ Fri, 24 Feb 2012 14:33:32 -0800 (PST)\r
+Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com\r
+ [74.125.82.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client\r
+ certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
+ D676540A39E for <notmuch@notmuchmail.org>; Fri, 24 Feb 2012 14:33:31 -0800\r
+ (PST)\r
+Received: by mail-ww0-f45.google.com with SMTP id dt12so2226566wgb.2\r
+ for <notmuch@notmuchmail.org>; Fri, 24 Feb 2012 14:33:31 -0800 (PST)\r
+Received-SPF: pass (google.com: domain of pieter@praet.org designates\r
+ 10.180.84.41 as permitted sender) client-ip=10.180.84.41; \r
+Authentication-Results: mr.google.com;\r
+ spf=pass (google.com: domain of pieter@praet.org\r
+ designates 10.180.84.41 as permitted sender)\r
+ smtp.mail=pieter@praet.org\r
+Received: from mr.google.com ([10.180.84.41])\r
+ by 10.180.84.41 with SMTP id v9mr1892673wiy.11.1330122811610 (num_hops\r
+ = 1); Fri, 24 Feb 2012 14:33:31 -0800 (PST)\r
+MIME-Version: 1.0\r
+Received: by 10.180.84.41 with SMTP id v9mr1466888wiy.11.1330122811554;\r
+ Fri, 24 Feb 2012 14:33:31 -0800 (PST)\r
+Received: from localhost ([109.131.181.26])\r
+ by mx.google.com with ESMTPS id h19sm6281406wiw.9.2012.02.24.14.33.30\r
+ (version=TLSv1/SSLv3 cipher=OTHER);\r
+ Fri, 24 Feb 2012 14:33:31 -0800 (PST)\r
+From: Pieter Praet <pieter@praet.org>\r
+To: David Bremner <david@tethera.net>,\r
+ Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
+Subject: [PATCH v2 6/6] emacs: `notmuch-show-tag-all' with prefix arg only\r
+ tags open messages\r
+Date: Fri, 24 Feb 2012 23:30:40 +0100\r
+Message-Id: <1330122640-18895-7-git-send-email-pieter@praet.org>\r
+X-Mailer: git-send-email 1.7.8.1\r
+In-Reply-To: <1330122640-18895-1-git-send-email-pieter@praet.org>\r
+References: <87wr7xqpuf.fsf@rocinante.cs.unb.ca>\r
+ <1330122640-18895-1-git-send-email-pieter@praet.org>\r
+X-Gm-Message-State:\r
+ ALoCoQkHwEgRqcSgUsWH2P172kGcyTAP78BDGxIq0fuOzwTQSge5VFIje50IMRuPRbNM9IZeM/PK\r
+Cc: Notmuch Mail <notmuch@notmuchmail.org>\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: Fri, 24 Feb 2012 22:33:34 -0000\r
+\r
+* emacs/notmuch-show.el\r
+\r
+ (notmuch-show-get-messages-ids):\r
+ If provided with optional argument PREDICATE, only return\r
+ Message-Id's of messages for which PREDICATE returns non-nil.\r
+\r
+ (notmuch-show-tag-all):\r
+ New argument ONLY-OPEN (set to `current-prefix-arg' if running\r
+ interactively): if non-nil, only change tags of *open* messages.\r
+ Also correct original docstring: 's/thread/buffer/'.\r
+\r
+ (notmuch-show-archive-thread):\r
+ Update wrt changes to `notmuch-show-tag-all'.\r
+\r
+* test/emacs\r
+\r
+ - Subtest "notmuch-show: change tags of open messages in current buffer"\r
+ is no longer broken...\r
+---\r
+ emacs/notmuch-show.el | 33 ++++++++++++++++++++++++---------\r
+ test/emacs | 1 -\r
+ 2 files changed, 24 insertions(+), 10 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 05606fc..4bd1a7c 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -1339,14 +1339,18 @@ (defun notmuch-show-get-message-id ()\r
+ "Return the message id of the current message."\r
+ (concat "id:\"" (notmuch-show-get-prop :id) "\""))\r
+ \r
+-(defun notmuch-show-get-messages-ids (&optional separator)\r
++(defun notmuch-show-get-messages-ids (&optional separator predicate)\r
+ "Return a list of Message-Id's of all messages in the current buffer.\r
+ \r
+ If provided with optional argument SEPARATOR, return a string\r
+-instead, consisting of all Message-Id's separated by SEPARATOR."\r
++instead, consisting of all Message-Id's separated by SEPARATOR.\r
++\r
++If provided with optional argument PREDICATE, only return\r
++Message-Id's of messages for which PREDICATE returns non-nil."\r
+ (let ((message-ids))\r
+ (notmuch-show-mapc\r
+- (lambda () (push (notmuch-show-get-message-id) message-ids)))\r
++ (lambda () (push (notmuch-show-get-message-id) message-ids))\r
++ predicate)\r
+ (if separator\r
+ (mapconcat 'identity message-ids separator)\r
+ message-ids)))\r
+@@ -1633,18 +1637,29 @@ (defun notmuch-show-tag (&optional initial-input)\r
+ initial-input (notmuch-show-get-message-id))))\r
+ (apply 'notmuch-show-tag-message tag-changes)))\r
+ \r
+-(defun notmuch-show-tag-all (&rest tag-changes)\r
+- "Change tags for all messages in the current thread.\r
++(defun notmuch-show-tag-all (only-open &rest tag-changes)\r
++ "Change tags of all messages in the current buffer.\r
++\r
++If ONLY-OPEN is non-nil, only change tags of *open* messages in\r
++the current buffer.\r
+ \r
+ TAG-CHANGES is a list of tag operations for `notmuch-tag'."\r
+- (interactive (notmuch-read-tag-changes nil notmuch-show-thread-id))\r
+- (apply 'notmuch-tag (notmuch-show-get-messages-ids " or ") tag-changes)\r
++ (interactive (cons current-prefix-arg\r
++ (notmuch-read-tag-changes nil notmuch-show-thread-id)))\r
++ (apply 'notmuch-tag\r
++ (notmuch-show-get-messages-ids\r
++ " or "\r
++ `(lambda ()\r
++ ,(if only-open '(notmuch-show-message-visible-p) t)))\r
++ tag-changes)\r
+ (notmuch-show-mapc\r
+ (lambda ()\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
++ (notmuch-show-set-tags new-tags))))\r
++ `(lambda ()\r
++ ,(if only-open '(notmuch-show-message-visible-p) t))))\r
+ \r
+ (defun notmuch-show-add-tag ()\r
+ "Same as `notmuch-show-tag' but sets initial input to '+'."\r
+@@ -1724,7 +1739,7 @@ (defun notmuch-show-archive-thread (&optional unarchive)\r
+ buffer."\r
+ (interactive "P")\r
+ (let ((op (if unarchive "+" "-")))\r
+- (notmuch-show-tag-all (concat op "inbox"))))\r
++ (notmuch-show-tag-all nil (concat op "inbox"))))\r
+ \r
+ (defun notmuch-show-archive-thread-then-next ()\r
+ "Archive each message in thread, then show next thread from search."\r
+diff --git a/test/emacs b/test/emacs\r
+index 9088ced..e6b0503 100755\r
+--- a/test/emacs\r
++++ b/test/emacs\r
+@@ -152,7 +152,6 @@ notmuch tag +"$del_tag" -"$add_tag" -- "$query" # revert tag changes\r
+ test_expect_equal "$count_changed" "$count_total" # assert that CHANGED == TOTAL\r
+ \r
+ test_begin_subtest "notmuch-show: change tags of open messages in current buffer"\r
+-test_subtest_known_broken\r
+ query="$os_x_darwin_thread"\r
+ filter="from:Jiang"\r
+ add_tag="notmuch-show-tag-all"\r
+-- \r
+1.7.8.1\r
+\r
projects / notmuch-archives.git / commitdiff