[PATCH v2 10/13] emacs: use message ids instead of thread id in `notmuch-show-operate...

diff --git a/66/0fad8539122ba671f94ea7421d87800c32e67c b/66/0fad8539122ba671f94ea7421d87800c32e67c
new file mode 100644 (file)
index 0000000..7fb678b
--- /dev/null
+++ b/66/0fad8539122ba671f94ea7421d87800c32e67c
@@ -0,0 +1,120 @@
+Return-Path: <dmitry.kurochkin@gmail.com>\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 2AD03431FBC\r
+       for <notmuch@notmuchmail.org>; Sun, 29 Jan 2012 18:28:30 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, 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 0IuB5uKf2Hpa for <notmuch@notmuchmail.org>;\r
+       Sun, 29 Jan 2012 18:28:28 -0800 (PST)\r
+Received: from mail-bk0-f53.google.com (mail-bk0-f53.google.com\r
+       [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 15835421181\r
+       for <notmuch@notmuchmail.org>; Sun, 29 Jan 2012 18:27:54 -0800 (PST)\r
+Received: by mail-bk0-f53.google.com with SMTP id 11so960260bke.26\r
+       for <notmuch@notmuchmail.org>; Sun, 29 Jan 2012 18:27:54 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
+       h=from:to:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=koECAv77ZnQagpNvAf+1eBUKUpoAqA0fyijQha0nnew=;\r
+       b=Tn+pbum9eFn50U/+vp0AYsFPTeviNGMaxM9+uRZlz88he2Z11U2MBYoY7fA6mGUNth\r
+       d2Fo+VyOZ/fC7rg+wYi84orAZvRS6CH1ND1QQCeDPeziR7+sMFq7BgESOY1GkkhJkr/U\r
+       FziL2RMEuiCrK/XtYKtuFPXNMVd7NhWSRzRMk=\r
+Received: by 10.204.10.80 with SMTP id o16mr4652760bko.50.1327890474827;\r
+       Sun, 29 Jan 2012 18:27:54 -0800 (PST)\r
+Received: from localhost ([91.144.186.21]) by mx.google.com with ESMTPS id\r
+       ci12sm34228723bkb.13.2012.01.29.18.27.53\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sun, 29 Jan 2012 18:27:54 -0800 (PST)\r
+From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 10/13] emacs: use message ids instead of thread id in\r
+       `notmuch-show-operate-all'\r
+Date: Mon, 30 Jan 2012 06:26:19 +0400\r
+Message-Id: <1327890382-548-11-git-send-email-dmitry.kurochkin@gmail.com>\r
+X-Mailer: git-send-email 1.7.8.3\r
+In-Reply-To: <1327890382-548-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+References: <1327725684-5887-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+       <1327890382-548-1-git-send-email-dmitry.kurochkin@gmail.com>\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: Mon, 30 Jan 2012 02:28:30 -0000\r
+\r
+Before the change, `notmuch-show-operate-all' used thread id for\r
+"notmuch tag" search.  This could result in tagging unexpected\r
+messages that were added to the thread after the notmuch-show buffer\r
+was created.  The patch changes `notmuch-show-operate-all' to use ids\r
+of shown messages to fix this.\r
+---\r
+ emacs/notmuch-show.el |   23 ++++++++++++++++++++++-\r
+ 1 files changed, 22 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 0d90c1e..b115a8f 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -1170,6 +1170,15 @@ All currently available key bindings:\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
++  (save-excursion\r
++    (goto-char (point-min))\r
++    (loop do (funcall function)\r
++        while (notmuch-show-goto-message-next))))\r
++\r
+ ;; Functions relating to the visibility of messages and their\r
+ ;; components.\r
+ \r
+@@ -1222,6 +1231,18 @@ Some useful entries are:\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 ()\r
++  "Return all message ids of messages in the current thread."\r
++  (let ((message-ids))\r
++    (notmuch-show-mapc\r
++     (lambda () (push (notmuch-show-get-message-id) message-ids)))\r
++    message-ids))\r
++\r
++(defun notmuch-show-get-messages-ids-search ()\r
++  "Return a search string for all message ids of messages in the\r
++current thread."\r
++  (mapconcat 'identity (notmuch-show-get-messages-ids) " or "))\r
++\r
+ ;; dme: Would it make sense to use a macro for many of these?\r
+ \r
+ (defun notmuch-show-get-filename ()\r
+@@ -1494,7 +1515,7 @@ TAG-CHANGES is a list of tag operations for `notmuch-tag'."\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-thread-id tag-changes)\r
++  (apply 'notmuch-tag (notmuch-show-get-messages-ids-search) tag-changes)\r
+   (save-excursion\r
+     (goto-char (point-min))\r
+     (loop do (let* ((current-tags (notmuch-show-get-tags))\r
+-- \r
+1.7.8.3\r
+\r