From 08370ece2f3b367c047320d34ec7e4efdbf4925d Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Fri, 14 Feb 2014 09:15:12 +0000 Subject: [PATCH] [WIP Patch 0/7] emacs: show tag changes in buffer --- 89/b814555c4cdd64b1ea6aaf8ac9a8b63421680f | 112 ++++++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 89/b814555c4cdd64b1ea6aaf8ac9a8b63421680f diff --git a/89/b814555c4cdd64b1ea6aaf8ac9a8b63421680f b/89/b814555c4cdd64b1ea6aaf8ac9a8b63421680f new file mode 100644 index 000000000..c2a7dfc71 --- /dev/null +++ b/89/b814555c4cdd64b1ea6aaf8ac9a8b63421680f @@ -0,0 +1,112 @@ +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 2484E431FC2 + for ; Fri, 14 Feb 2014 01:15:34 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 2.7 +X-Spam-Level: ** +X-Spam-Status: No, score=2.7 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, + FREEMAIL_REPLY=2.499, 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 C+3JDbkNYd+n for ; + Fri, 14 Feb 2014 01:15:28 -0800 (PST) +Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com + [209.85.212.169]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 73425431FAE + for ; Fri, 14 Feb 2014 01:15:28 -0800 (PST) +Received: by mail-wi0-f169.google.com with SMTP id e4so300452wiv.2 + for ; Fri, 14 Feb 2014 01:15:25 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id; + bh=QNHvLBt7Vk3yL63oKg1CpVClKWwOWYq6UBaNoej+yNk=; + b=sTRQWdHO8wBe/T0hw+hbp5ag3xbXNpjm2ayi3NHT9nuUpliBZupe6dlxzeN7lxA7RG + GQK/rGRSCI4XGsObLmV590afOYuVm9mC171bd3xwuOcwzvFJXAAOZD76acs1eFxOecU/ + PoiLde7cUKA6MfGFYmVYeH0TvvQHvptzPMUYcC9XH+5LopGSe+lwbvYUyDSZVvenwyKp + 7fsYri+yI2UsY/6Q1nyJwncvq2M1fTK4szFCUJm7A8nAtdev8zxoMypFtALesyuu8XbS + DZlBVjkgRIzvGbLCuPwPFxzRcycfbNarafwZ3Rqk9977Knl+FoIAVywvcwaeXMvE7c0M + hvqw== +X-Received: by 10.194.170.133 with SMTP id am5mr919183wjc.42.1392369324531; + Fri, 14 Feb 2014 01:15:24 -0800 (PST) +Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) + by mx.google.com with ESMTPSA id f3sm2712889wiv.2.2014.02.14.01.15.23 + for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Fri, 14 Feb 2014 01:15:23 -0800 (PST) +From: Mark Walters +To: notmuch@notmuchmail.org, + Austin Clements +Subject: [WIP Patch 0/7] emacs: show tag changes in buffer +Date: Fri, 14 Feb 2014 09:15:12 +0000 +Message-Id: <1392369319-24508-1-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +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: Fri, 14 Feb 2014 09:15:34 -0000 + +This verson is not intended for general use/review but so Austin can +see my attempt at integrating his regexp tag matching code into the +added/deleted code. However, of course, comments from anyone else are +gratefully received. + +Patch 1/7 is basically Austin's patch +id:1392226351-31440-1-git-send-email-amdragon@mit.edu with a small +bugfix. Patches 2-7 are the updated version of +id:1390087855-26194-1-git-send-email-markwalters1009@gmail.com + +There are three comments for Patch 4 (the key one of 2-7). First I use +(cons 'deleted/'added/nil tag) as the key for the hashtable +lookup. Secondly the deleted/added tag formatting is now applied on +top of the normal tag formatting (as suggested by Austin). Thirdly: +this has one slightly tricky corner case: a user could hide the tag +normally but want it shown when deleted. This has to be special cased +in the code the avoid applying e.g. propertize to the output of the +first stage formatting: namely nil. A possible alternative would be to +treat all empty-strings as "omit this tag" but I am not sure what +things like images look like to emacs. + + +Best wishes + +Mark + + + + +Austin Clements (1): + Make keys of notmuch-tag-formats regexps and use caching + +Mark Walters (6): + emacs: tag split customise option for format-tags into a widget + emacs: tag: add customize for deleted/added tag formats + emacs: show: mark tags changed since buffer loaded + emacs: show: use orig-tags for tag display + emacs: search: use orig-tags in search + emacs: tree: use orig-tags in search + + emacs/notmuch-show.el | 6 +- + emacs/notmuch-tag.el | 186 ++++++++++++++++++++++++++++++++++++++----------- + emacs/notmuch-tree.el | 9 ++- + emacs/notmuch.el | 40 ++++++---- + test/test-lib.el | 5 ++ + 5 files changed, 184 insertions(+), 62 deletions(-) + +-- +1.7.9.1 + -- 2.26.2