[PATCH 4/6] emacs: add predicate arg to `notmuch-show-mapc'

diff --git a/1a/a4a29a0d68f7a86ee23e6f6f8749d730e80a73 b/1a/a4a29a0d68f7a86ee23e6f6f8749d730e80a73
new file mode 100644 (file)
index 0000000..edcf848
--- /dev/null
+++ b/1a/a4a29a0d68f7a86ee23e6f6f8749d730e80a73
@@ -0,0 +1,125 @@
+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 2BB60431FC2\r
+       for <notmuch@notmuchmail.org>; Thu, 23 Feb 2012 15:11:47 -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 42xN05KBSdAo for <notmuch@notmuchmail.org>;\r
+       Thu, 23 Feb 2012 15:11:45 -0800 (PST)\r
+Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com\r
+       [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id C9F80431FC3\r
+       for <notmuch@notmuchmail.org>; Thu, 23 Feb 2012 15:11:39 -0800 (PST)\r
+Received: by mail-wi0-f181.google.com with SMTP id hi8so1241599wib.26\r
+       for <notmuch@notmuchmail.org>; Thu, 23 Feb 2012 15:11:39 -0800 (PST)\r
+Received-SPF: pass (google.com: domain of pieter@praet.org designates\r
+       10.180.79.229 as permitted sender) client-ip=10.180.79.229; \r
+Authentication-Results: mr.google.com;\r
+       spf=pass (google.com: domain of pieter@praet.org\r
+       designates 10.180.79.229 as permitted sender)\r
+       smtp.mail=pieter@praet.org\r
+Received: from mr.google.com ([10.180.79.229])\r
+       by 10.180.79.229 with SMTP id m5mr822997wix.6.1330038699483 (num_hops =\r
+       1); Thu, 23 Feb 2012 15:11:39 -0800 (PST)\r
+MIME-Version: 1.0\r
+Received: by 10.180.79.229 with SMTP id m5mr667007wix.6.1330038699413;\r
+       Thu, 23 Feb 2012 15:11:39 -0800 (PST)\r
+Received: from localhost ([109.131.181.26])\r
+       by mx.google.com with ESMTPS id gd8sm7407101wib.2.2012.02.23.15.11.38\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Thu, 23 Feb 2012 15:11:39 -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 4/6] emacs: add predicate arg to `notmuch-show-mapc'\r
+Date: Fri, 24 Feb 2012 00:09:12 +0100\r
+Message-Id: <1330038554-10347-4-git-send-email-pieter@praet.org>\r
+X-Mailer: git-send-email 1.7.8.1\r
+In-Reply-To: <878vjtqhcg.fsf@praet.org>\r
+References: <878vjtqhcg.fsf@praet.org>\r
+X-Gm-Message-State:\r
+ ALoCoQnQ/373VJmaUm6gcc215DUmyqhbWLyZngUz/fQHJ2K8yBQ7DFvtnLa+5WwYgvdDJILnMQpJ\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: Thu, 23 Feb 2012 23:11:47 -0000\r
+\r
+* emacs/notmuch-show.el\r
+\r
+  (notmuch-show-mapc):\r
+    Only call FUNCTION if new argument PREDICATE is satisfied.\r
+    Also correct original docstring: 's/thread/buffer/'.\r
+\r
+  (notmuch-show-get-messages-ids):\r
+    Update wrt changes to `notmuch-show-mapc'.\r
+\r
+  (notmuch-show-tag-all):\r
+    Update wrt changes to `notmuch-show-mapc'.\r
+---\r
+ emacs/notmuch-show.el |   15 ++++++++-------\r
+ 1 files changed, 8 insertions(+), 7 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index aa9ccee..5fc0e43 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -1272,13 +1272,14 @@ (defun notmuch-show-goto-message-previous ()\r
+     (notmuch-show-move-to-message-top)\r
+     t))\r
+ \r
+-(defun notmuch-show-mapc (function)\r
+-  "Iterate through all messages in the current thread with\r
+-`notmuch-show-goto-message-next' and call FUNCTION for side\r
+-effects."\r
++(defun notmuch-show-mapc (predicate function)\r
++  "Iterate through all messages in the current buffer with\r
++`notmuch-show-goto-message-next'.  If PREDICATE is satisfied,\r
++call FUNCTION for side effects."\r
+   (save-excursion\r
+     (goto-char (point-min))\r
+-    (loop do (funcall function)\r
++    (loop do (if (eval predicate)\r
++               (funcall function))\r
+         while (notmuch-show-goto-message-next))))\r
+ \r
+ ;; Functions relating to the visibility of messages and their\r
+@@ -1336,7 +1337,7 @@ (defun notmuch-show-get-message-id ()\r
+ (defun notmuch-show-get-messages-ids ()\r
+   "Return all message ids of messages in the current thread."\r
+   (let ((message-ids))\r
+-    (notmuch-show-mapc\r
++    (notmuch-show-mapc t\r
+      (lambda () (push (notmuch-show-get-message-id) message-ids)))\r
+     message-ids))\r
+ \r
+@@ -1633,7 +1634,7 @@ (defun notmuch-show-tag-all (&rest tag-changes)\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-search) tag-changes)\r
+-  (notmuch-show-mapc\r
++  (notmuch-show-mapc t\r
+    (lambda ()\r
+      (let* ((current-tags (notmuch-show-get-tags))\r
+           (new-tags (notmuch-update-tags current-tags tag-changes)))\r
+-- \r
+1.7.8.1\r
+\r