[PATCH 6/7] emacs: search: use orig-tags in search

diff --git a/5a/df061ec6e5aa3cd1459cebe969dcaa3eccdb2a b/5a/df061ec6e5aa3cd1459cebe969dcaa3eccdb2a
new file mode 100644 (file)
index 0000000..cc89cf9
--- /dev/null
+++ b/5a/df061ec6e5aa3cd1459cebe969dcaa3eccdb2a
@@ -0,0 +1,102 @@
+Return-Path: <markwalters1009@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 248AA431FC9\r
+       for <notmuch@notmuchmail.org>; Sat, 18 Jan 2014 15:31:25 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       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 PhCqkH2iADZJ for <notmuch@notmuchmail.org>;\r
+       Sat, 18 Jan 2014 15:31:20 -0800 (PST)\r
+Received: from mail-we0-f172.google.com (mail-we0-f172.google.com\r
+       [74.125.82.172]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 8560E431FBC\r
+       for <notmuch@notmuchmail.org>; Sat, 18 Jan 2014 15:31:12 -0800 (PST)\r
+Received: by mail-we0-f172.google.com with SMTP id q58so5893134wes.17\r
+       for <notmuch@notmuchmail.org>; Sat, 18 Jan 2014 15:31:11 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
+       bh=JilFrUBfOH6c5OhuD/HT7AR/Ixh90DR5aHN1maipx9Q=;\r
+       b=MptqKIaUcEL3qPGEVonFILfCG/Jw5ncopfrsed3dlIHiNi6YNDXhiDFOkG/G469ids\r
+       LEr6VvNoJ0NqVikFVgQY08P6E/tKe2De4D3q2iR2FAovQ+wD4z4BFLAMeddrqpkcQaun\r
+       HAsbGmYj+NuCYjoy15pHb9dClfjDE7xfS9yTlGbOX5SjPabMpmtocT/fugVaYZdNBSsw\r
+       Lj1Tg2Q705wVvI+/YZ+6a2GhUHonU315s6wYU3VhuuKvGg5jrnq+J+k6VvpwORM8FGrM\r
+       6dB4t4lNa5fzxyBK/v3k3cJ+3I6tD3Qc9orq3kfmPrtWzSztr9MM1fs8QLM3G7mwCzfX\r
+       Fb4A==\r
+X-Received: by 10.194.109.68 with SMTP id hq4mr8172079wjb.12.1390087871463;\r
+       Sat, 18 Jan 2014 15:31:11 -0800 (PST)\r
+Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
+       by mx.google.com with ESMTPSA id ea4sm10966525wib.7.2014.01.18.15.31.10\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sat, 18 Jan 2014 15:31:10 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 6/7] emacs: search: use orig-tags in search\r
+Date: Sat, 18 Jan 2014 23:30:54 +0000\r
+Message-Id: <1390087855-26194-7-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1390087855-26194-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1390087855-26194-1-git-send-email-markwalters1009@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: Sat, 18 Jan 2014 23:31:25 -0000\r
+\r
+This uses the recent functionality to show the tag changes in the\r
+search buffer. Currently this is only used to show changes the search\r
+buffer makes itself: i.e., it does not make display any changes\r
+reflecting tagging done by other notmuch-buffers.\r
+---\r
+ emacs/notmuch.el |   12 +++++++++---\r
+ 1 files changed, 9 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index 1436e5a..f0ea5d4 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -753,14 +753,20 @@ non-authors is found, assume that all of the authors match."\r
+      format-string (notmuch-sanitize (plist-get result :authors))))\r
+ \r
+    ((string-equal field "tags")\r
+-    (let ((tags (plist-get result :tags)))\r
+-      (insert (format format-string (notmuch-tag-format-tags tags tags)))))))\r
++    (let ((tags (plist-get result :tags))\r
++        (orig-tags (plist-get result :orig-tags)))\r
++      (insert (format format-string (notmuch-tag-format-tags tags orig-tags)))))))\r
+ \r
+ (defun notmuch-search-show-result (result &optional pos)\r
+   "Insert RESULT at POS or the end of the buffer if POS is null."\r
+   ;; Ignore excluded matches\r
+   (unless (= (plist-get result :matched) 0)\r
+-    (let ((beg (or pos (point-max))))\r
++    (let ((beg (or pos (point-max)))\r
++        ;; If we are inserting the result for the first time POS\r
++        ;; will be nil and we should set orig-tags.\r
++        (result (if pos\r
++                    result\r
++                  (plist-put result :orig-tags (plist-get result :tags)))))\r
+       (save-excursion\r
+       (goto-char beg)\r
+       (dolist (spec notmuch-search-result-format)\r
+-- \r
+1.7.9.1\r
+\r