[WIP Patch 5/7] emacs: show: use orig-tags for tag display

diff --git a/53/78507045f3b8d88f7c6dfa0ba17c02f6c2b2e0 b/53/78507045f3b8d88f7c6dfa0ba17c02f6c2b2e0
new file mode 100644 (file)
index 0000000..ffae047
--- /dev/null
+++ b/53/78507045f3b8d88f7c6dfa0ba17c02f6c2b2e0
@@ -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 2CF82431FC3\r
+       for <notmuch@notmuchmail.org>; Fri, 14 Feb 2014 01:15:55 -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 MEXtWVQvk3MF for <notmuch@notmuchmail.org>;\r
+       Fri, 14 Feb 2014 01:15:50 -0800 (PST)\r
+Received: from mail-wg0-f51.google.com (mail-wg0-f51.google.com\r
+ [74.125.82.51])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 54DAD431FC7   for <notmuch@notmuchmail.org>; Fri, 14 Feb 2014 01:15:35 -0800\r
+ (PST)\r
+Received: by mail-wg0-f51.google.com with SMTP id n12so184065wgh.18\r
+       for <notmuch@notmuchmail.org>; Fri, 14 Feb 2014 01:15:34 -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=OtljRpbfMX1AXd9Wj2R5ZiDRa0FgMQhq8Gb1mIiq5as=;\r
+       b=uOjeBAPB2WoHSDUA7gqwT0V+jANaEJUm3bYazweLeVrHt13rf3JaPKQTBPtKrMNyTa\r
+       EpqFV50VfHVnvf+RMBwSEj8n5PPUu7icYkmHGPoSrMCIkgk3UF3iwPTArCJQHUSaf4F3\r
+       5N41XjmPBS5W734DujK+Kqi+2rPcRcBEvsNBMgBI6502yk6eBBCRdyyHPlKuYOZvHRbi\r
+       gTdKdLbByKIKeGtX1oe/oN96uwuTluE2esRbS1gqRE9QrWZvOcfo1uAeD9EV2avLygME\r
+       mU7grY5V8yhxS641bPFwVdKhbLxAA6In+XQAqtzBNpPe7w5wxOfeDK6C6F5gsdr7yLWS\r
+       PgwA==\r
+X-Received: by 10.194.92.199 with SMTP id co7mr5021686wjb.14.1392369334216;\r
+       Fri, 14 Feb 2014 01:15:34 -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 de3sm11136384wjb.8.2014.02.14.01.15.33\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Fri, 14 Feb 2014 01:15:33 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org,\r
+       Austin Clements <amdragon@MIT.EDU>\r
+Subject: [WIP Patch 5/7] emacs: show: use orig-tags for tag display\r
+Date: Fri, 14 Feb 2014 09:15:17 +0000\r
+Message-Id: <1392369319-24508-6-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1392369319-24508-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1392369319-24508-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: Fri, 14 Feb 2014 09:15:55 -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 1ce56f9..97243dc 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -344,7 +344,7 @@ operation on the contents of the current buffer."\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
+@@ -1167,6 +1167,8 @@ function is used."\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