[Patch v3 6/8] emacs: show: use orig-tags for tag display

diff --git a/20/f4e1ad13d6824e7d96e0f247f3d46e641c75a1 b/20/f4e1ad13d6824e7d96e0f247f3d46e641c75a1
new file mode 100644 (file)
index 0000000..653d086
--- /dev/null
+++ b/20/f4e1ad13d6824e7d96e0f247f3d46e641c75a1
@@ -0,0 +1,95 @@
+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 B40C9431FCF\r
+       for <notmuch@notmuchmail.org>; Tue, 11 Mar 2014 21:10:36 -0700 (PDT)\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 CcIPDj3Kujuj for <notmuch@notmuchmail.org>;\r
+       Tue, 11 Mar 2014 21:10:32 -0700 (PDT)\r
+Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com\r
+       [209.85.212.171]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 6599C431FD2\r
+       for <notmuch@notmuchmail.org>; Tue, 11 Mar 2014 21:10:14 -0700 (PDT)\r
+Received: by mail-wi0-f171.google.com with SMTP id hn9so1814215wib.10\r
+       for <notmuch@notmuchmail.org>; Tue, 11 Mar 2014 21:10:11 -0700 (PDT)\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=E3yuVeWINftbYUwMXsfkhJnWRpCCr0QMCERkfRJsyic=;\r
+       b=Y0H+U+PckUAji5GuT60XIs/I0tdH07YnOocpLt2MnZIZv19P9epVfHkRnJLQ07exDF\r
+       q0S8hAJ4QhzRQvYw1xZum+1hheDIWG1HmKnaX4h8B3RR5cL/0UidmDZ0QNrqYgJEu6Xp\r
+       IbO3CiPQ4RISpLKEkJm0v7WZUAVm1xX4JYh0b5J7eZ3Stws3Xf11Xtv2qsSGGfEbpKnR\r
+       885XaGr69y7W4ty0PqjcAuAkwmTUpos7a5zS+a8ovizAeFlntHcC76PbziCJ+YX9jerO\r
+       eu4hmNrMk7z1nqLrePARF7J7W69Jo/5tSumRzBRmW1zmCpV7yGJgoDA47tuPLsfzSdWp\r
+       QJRw==\r
+X-Received: by 10.180.189.10 with SMTP id ge10mr5860567wic.47.1394597411844;\r
+       Tue, 11 Mar 2014 21:10:11 -0700 (PDT)\r
+Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
+       by mx.google.com with ESMTPSA id\r
+       bm8sm66458039wjc.12.2014.03.11.21.10.10 for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Tue, 11 Mar 2014 21:10:11 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org,\r
+       amdragon@mit.edu\r
+Subject: [Patch v3 6/8] emacs: show: use orig-tags for tag display\r
+Date: Wed, 12 Mar 2014 04:09:55 +0000\r
+Message-Id: <1394597397-8486-7-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1394597397-8486-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1394597397-8486-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: Wed, 12 Mar 2014 04:10:36 -0000\r
+\r
+This uses the previous patch to show the tag changes that have occured\r
+in the show buffer since it was last loaded/refreshed.\r
+---\r
+ emacs/notmuch-show.el |    4 +++-\r
+ 1 files changed, 3 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 5492be4..f6ca827 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -344,7 +344,7 @@ (defun notmuch-show-update-tags (tags)\r
+     (if (re-search-forward "(\\([^()]*\\))$" (line-end-position) t)\r
+       (let ((inhibit-read-only t))\r
+         (replace-match (concat "("\r
+-                               (notmuch-tag-format-tags tags tags)\r
++                               (notmuch-tag-format-tags tags (notmuch-show-get-prop :orig-tags))\r
+                                ")"))))))\r
+ \r
+ (defun notmuch-clean-address (address)\r
+@@ -1168,6 +1168,8 @@ (defun notmuch-show-build-buffer ()\r
+ \r
+       (jit-lock-register #'notmuch-show-buttonise-links)\r
+ \r
++      (notmuch-show-mapc (lambda () (notmuch-show-set-prop :orig-tags (notmuch-show-get-tags))))\r
++\r
+       ;; Set the header line to the subject of the first message.\r
+       (setq header-line-format (notmuch-sanitize (notmuch-show-strip-re (notmuch-show-get-subject))))\r
+ \r
+-- \r
+1.7.9.1\r
+\r