From 4d24fdf8643f8b497536d6eab9b5a50ed23ef951 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sat, 22 Mar 2014 11:51:12 +0000 Subject: [PATCH] [Patch v4 8/8] emacs: tree: use orig-tags in search --- 77/f4c5c7ba3e14342c8a3b3fbe142f03257cf98d | 109 ++++++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 77/f4c5c7ba3e14342c8a3b3fbe142f03257cf98d diff --git a/77/f4c5c7ba3e14342c8a3b3fbe142f03257cf98d b/77/f4c5c7ba3e14342c8a3b3fbe142f03257cf98d new file mode 100644 index 000000000..526723f6d --- /dev/null +++ b/77/f4c5c7ba3e14342c8a3b3fbe142f03257cf98d @@ -0,0 +1,109 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 5D794429E3A + for ; Sat, 22 Mar 2014 04:52:11 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.201 +X-Spam-Level: +X-Spam-Status: No, score=0.201 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id RaZoU6H31qSV for ; + Sat, 22 Mar 2014 04:52:05 -0700 (PDT) +Received: from mail-we0-f179.google.com (mail-we0-f179.google.com + [74.125.82.179]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 25FD0431FC4 + for ; Sat, 22 Mar 2014 04:51:38 -0700 (PDT) +Received: by mail-we0-f179.google.com with SMTP id x48so2289859wes.10 + for ; Sat, 22 Mar 2014 04:51:37 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:in-reply-to:references + :mime-version:content-type:content-transfer-encoding; + bh=FZm9rxNSdyqOZsCocwmHG6SegLk9ZC4T1RbsHggNT54=; + b=WuEjp24pskRcTLnvY4ykg63cmmxL1b0VvHT1Mhx9xDNHMFYbgd5UbW4R1k2gPDQh9O + 4m3BNh6NiAHLhLeOxOEtETOrPjsnZlLgEIgW/4DgvzoQvE32Ey3+Rl9kfxChsExx6ubO + CF411U+Tokv7KJhKcBCqN5Ara8dCxfBg43g6oBJ17YDH5Rp3S0jKgLt8Qzihk9zsCf6r + i27ZCLuGyqOOt+Mnh0kAKxHmdnIkA8Pu0ke9H2WXhKxZxGJt8XOyrDRW+Bc3JZaPC0oF + 2HJHqfeujCrKqnVYy9g6LVy5qzL1Ac4RYCzE2uf/5mbyi9pdjP3J54SBkn5R1yQFIaux + 2OIA== +X-Received: by 10.180.23.99 with SMTP id l3mr3275251wif.47.1395489097100; + Sat, 22 Mar 2014 04:51:37 -0700 (PDT) +Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) + by mx.google.com with ESMTPSA id f3sm16245200wiv.2.2014.03.22.04.51.35 + for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Sat, 22 Mar 2014 04:51:36 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org, + amdragon@mit.edu +Subject: [Patch v4 8/8] emacs: tree: use orig-tags in search +Date: Sat, 22 Mar 2014 11:51:12 +0000 +Message-Id: <1395489072-19001-9-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1395489072-19001-1-git-send-email-markwalters1009@gmail.com> +References: <1395489072-19001-1-git-send-email-markwalters1009@gmail.com> +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sat, 22 Mar 2014 11:52:11 -0000 + +This uses the recent functionality to show the tag changes in the tree +buffer. Currently this is only used to show changes the tree buffer +makes itself: i.e., it does not make display any changes reflecting +tagging done by other notmuch-buffers. +--- + emacs/notmuch-tree.el | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el +index 8bf2fbc..7d5f475 100644 +--- a/emacs/notmuch-tree.el ++++ b/emacs/notmuch-tree.el +@@ -701,10 +701,11 @@ (defun notmuch-tree-format-field (field format-string msg) + + ((string-equal field "tags") + (let ((tags (plist-get msg :tags)) ++ (orig-tags (plist-get msg :orig-tags)) + (face (if match + 'notmuch-tree-match-tag-face + 'notmuch-tree-no-match-tag-face))) +- (format format-string (notmuch-tag-format-tags tags tags face))))))) ++ (format format-string (notmuch-tag-format-tags tags orig-tags face))))))) + + (defun notmuch-tree-format-field-list (field-list msg) + "Format fields of MSG according to FIELD-LIST and return string" +@@ -766,8 +767,10 @@ (defun notmuch-tree-insert-tree (tree depth tree-status first last) + (push "├" tree-status))) + + (push (concat (if replies "┬" "─") "►") tree-status) +- (plist-put msg :first (and first (eq 0 depth))) +- (notmuch-tree-goto-and-insert-msg (plist-put msg :tree-status tree-status)) ++ (setq msg (plist-put msg :first (and first (eq 0 depth)))) ++ (setq msg (plist-put msg :tree-status tree-status)) ++ (setq msg (plist-put msg :orig-tags (plist-get msg :tags))) ++ (notmuch-tree-goto-and-insert-msg msg) + (pop tree-status) + (pop tree-status) + +-- +1.7.10.4 + -- 2.26.2