From be71dd4271f6486a9089acd3bb4a00f0a9d579a5 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Tue, 11 Mar 2014 22:29:30 +2000 Subject: [PATCH] Re: [PATCH v2 4/7] emacs: show: mark tags changed since buffer loaded --- b5/0d0a8b1581e2c7d853096eb90be8ac822d89af | 305 ++++++++++++++++++++++ 1 file changed, 305 insertions(+) create mode 100644 b5/0d0a8b1581e2c7d853096eb90be8ac822d89af diff --git a/b5/0d0a8b1581e2c7d853096eb90be8ac822d89af b/b5/0d0a8b1581e2c7d853096eb90be8ac822d89af new file mode 100644 index 000000000..64ecbc186 --- /dev/null +++ b/b5/0d0a8b1581e2c7d853096eb90be8ac822d89af @@ -0,0 +1,305 @@ +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 EFB50431FBD + for ; Mon, 10 Mar 2014 19:29:40 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[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 MNz8lro1YOaN for ; + Mon, 10 Mar 2014 19:29:34 -0700 (PDT) +Received: from dmz-mailsec-scanner-8.mit.edu (dmz-mailsec-scanner-8.mit.edu + [18.7.68.37]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 33FF8431FBC + for ; Mon, 10 Mar 2014 19:29:34 -0700 (PDT) +X-AuditID: 12074425-f79906d000000cf9-c6-531e750d4639 +Received: from mailhub-auth-4.mit.edu ( [18.7.62.39]) + (using TLS with cipher AES256-SHA (256/256 bits)) + (Client did not present a certificate) + by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP + id D5.01.03321.D057E135; Mon, 10 Mar 2014 22:29:33 -0400 (EDT) +Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) + by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id s2B2TWWb018615; + Mon, 10 Mar 2014 22:29:33 -0400 +Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91]) + (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s2B2TUaK015699 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); + Mon, 10 Mar 2014 22:29:31 -0400 +Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.80) + (envelope-from ) + id 1WNCRe-0008P9-CK; Mon, 10 Mar 2014 22:29:30 -0400 +From: Austin Clements +To: Mark Walters , notmuch@notmuchmail.org +Subject: Re: [PATCH v2 4/7] emacs: show: mark tags changed since buffer loaded +In-Reply-To: <1392841212-8494-5-git-send-email-markwalters1009@gmail.com> +References: <1392841212-8494-1-git-send-email-markwalters1009@gmail.com> + <1392841212-8494-5-git-send-email-markwalters1009@gmail.com> +User-Agent: Notmuch/0.17~rc2+14~g06f47e0 (http://notmuchmail.org) Emacs/23.4.1 + (i486-pc-linux-gnu) +Date: Mon, 10 Mar 2014 22:29:30 -0400 +Message-ID: <878ush31th.fsf@awakening.csail.mit.edu> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFnrEIsWRmVeSWpSXmKPExsUixG6nrstbKhdsMPWVqMXquTwW12/OZHZg + 8tg56y67x7NVt5gDmKK4bFJSczLLUov07RK4Mg5umcdYMMGzYvmVXqYGxoeWXYycHBICJhL/ + 3t5mh7DFJC7cW8/WxcjFISQwm0li/r/dTBDORkaJ35dvQjmnmSS+HNnNCuEsYZRou9LACtLP + JqAhsW3/ckYQW0TAVeLpt8/MILawgJ/EnEtdTCA2p4CnxM5Ns9khmlsZJeYtfwDWICqQJHF6 + 6m+wQSwCqhLzj04Fs3mBDny09igjhC0ocXLmExYQm1lAS+LGv5dMExgFZiFJzUKSWsDItIpR + NiW3Sjc3MTOnODVZtzg5MS8vtUjXQi83s0QvNaV0EyM4KF1UdzBOOKR0iFGAg1GJhzfAVy5Y + iDWxrLgy9xCjJAeTkiivUDFQiC8pP6UyI7E4I76oNCe1+BCjBAezkgjvaQugHG9KYmVValE+ + TEqag0VJnLfvrESwkEB6YklqdmpqQWoRTFaGg0NJgrcQZKhgUWp6akVaZk4JQpqJgxNkOA/Q + cBOQGt7igsTc4sx0iPwpRkUpcd5jIAkBkERGaR5cLyxpvGIUB3pFmNcTpIoHmHDgul8BDWYC + Gtx8XApkcEkiQkqqgXH6A6bLfjqptroXl3VevrH84V/TlynSnkLxd+85qtz86HLSSdSh7CZn + /5Wil+fWLgy+Ynzyc3HZjXUqf5ysX7BHqHN4Vy0NNNn5TJXz6qIJDp952Fv55VYxtPX6bHSa + ziXF+P6mm5WYYP3lx0frHzM9qJ0UM+G3VG3QOp4+1o6f/AUVU8Ij/JVYijMSDbWYi4oTAbrW + H//1AgAA +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: Tue, 11 Mar 2014 02:29:41 -0000 + +On Wed, 19 Feb 2014, Mark Walters wrote: +> This allows (and requires) the original-tags to be passed along with +> the current-tags to be passed to notmuch-tag-format-tags. This allows +> the tag formatting to show added and deleted tags.By default a removed +> tag is displayed with strike-through in red (if strike-through is not +> available, eg on a terminal, inverse video is used instead) and an +> added tag is displayed underlined in green. +> +> If the caller does not wish to use the new feature it can pass +> current-tags for both arguments and, at this point, we do exactly that +> in the three callers of this function. +> +> Note, we cannot tidily allow original-tags to be optional because we would +> need to distinguish nil meaning "we are not specifying original-tags" +> from nil meaning there were no original-tags (an empty list). +> +> We use this in subsequent patches to make it clear when a message was +> unread when you first loaded a show buffer (previously the unread tag +> could be removed before a user realised that it had been unread). +> +> The code adds into the existing tag formatting code. The user can +> specify exactly how a tag should be displayed normally, when deleted, +> or when added. For convenience an entry for the empty string in the +> notmuch-tag-formats (and the corresponding notmuch-tag-deleted-formats +> notmuch-tag-added-formats) is applied to all tags which do not have an +> explicit match. +> +> This means that a user can tell notmuch not to show deleted tags at +> all by setting notmuch-tag-deleted-formats to +> '(("" nil)) +> or not to show any deleted tags except "unread" by setting it to +> '(("" nil) + +Same comment about ".*" on these two. + +> ("unread" (propertize tag 'face '(strike-through "red")))) +> +> All the variables are customizable; however, more complicated cases +> like changing the face depending on the type of display will require +> custom lisp. +> +> Currently this overrides notmuch-tag-deleted-formats for the tests +> setting it to '(("" nil)) so that they get removed from the display + +.. and here. + +> and, thus, all tests still pass. +> --- +> emacs/notmuch-show.el | 4 +- +> emacs/notmuch-tag.el | 65 ++++++++++++++++++++++++++++++++++++++---------- +> emacs/notmuch-tree.el | 2 +- +> emacs/notmuch.el | 2 +- +> test/test-lib.el | 5 ++++ +> 5 files changed, 60 insertions(+), 18 deletions(-) +> +> diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +> index 4bddf6c..719e7d1 100644 +> --- a/emacs/notmuch-show.el +> +++ b/emacs/notmuch-show.el +> @@ -344,7 +344,7 @@ operation on the contents of the current buffer." +> (if (re-search-forward "(\\([^()]*\\))$" (line-end-position) t) +> (let ((inhibit-read-only t)) +> (replace-match (concat "(" +> - (notmuch-tag-format-tags tags) +> + (notmuch-tag-format-tags tags tags) +> ")")))))) +> +> (defun notmuch-clean-address (address) +> @@ -423,7 +423,7 @@ message at DEPTH in the current thread." +> " (" +> date +> ") (" +> - (notmuch-tag-format-tags tags) +> + (notmuch-tag-format-tags tags tags) +> ")\n") +> (overlay-put (make-overlay start (point)) 'face 'notmuch-message-summary-face))) +> +> diff --git a/emacs/notmuch-tag.el b/emacs/notmuch-tag.el +> index 064fbdb..869b97d 100644 +> --- a/emacs/notmuch-tag.el +> +++ b/emacs/notmuch-tag.el +> @@ -185,36 +185,73 @@ This can be used with `notmuch-tag-format-image-data'." +> +> ") +> +> -(defun notmuch-tag-format-tag (tag) +> - "Format TAG by looking into `notmuch-tag-formats'." +> - (let ((formatted (gethash tag notmuch-tag--format-cache 'missing))) +> +(defun notmuch-tag-format-tag-by-state (tag formatted-tag tag-state) +> + "Format TAG by looking into the appropriate `notmuch-tag-formats`. + +Since you're rewriting the docstrings, you might as well change "by +looking into" to "according to". + +> + +> +Applies formats for TAG from the appropriate one of +> +`notmuch-tag-formats`, `notmuch-tag-deleted-formats` and +> +`notmuch-tag-added-formats` based on TAG-STATE to the partially +> +formatted tag FORMATTED-TAG." +> + (let ((formatted (gethash (cons tag tag-state) notmuch-tag--format-cache 'missing))) +> (when (eq formatted 'missing) +> - (let* ((formats +> + (let* ((tag-formats (cond ((null tag-state) notmuch-tag-formats) +> + ((eq 'deleted tag-state) notmuch-tag-deleted-formats) +> + ((eq 'added tag-state) notmuch-tag-added-formats))) + +Use `case' instead of `cond'? + +> + (formats +> (save-match-data +> - (assoc* tag notmuch-tag-formats +> + (assoc* tag tag-formats +> :test (lambda (tag key) +> (and (eq (string-match key tag) 0) +> (= (match-end 0) (length tag)))))))) +> (setq formatted +> (cond +> - ((null formats) ;; - Tag not in `notmuch-tag-formats', +> - tag) ;; the format is the tag itself. +> + ((null formats) ;; - Tag not in `tag-formats', +> + formatted-tag) ;; the format is the tag itself. +> ((null (cdr formats)) ;; - Tag was deliberately hidden, +> nil) ;; no format must be returned +> - (t ;; - Tag was found and has formats, +> - (let ((tag tag)) ;; we must apply all the formats. +> + (t +> + ;; Tag was found and has formats, we must apply all +> + ;; the formats. FORMATTED-TAG may be null so treat +> + ;; that as a special case. +> + (let ((tag (or formatted-tag ""))) +> (dolist (format (cdr formats) tag) +> - (setq tag (eval format))))))) +> - (puthash tag formatted notmuch-tag--format-cache))) +> + (setq tag (eval format))) +> + (if (and (null formatted-tag) +> + (equal tag "")) +> + nil +> + tag))))) +> + (puthash (cons tag tag-state) formatted notmuch-tag--format-cache))) +> formatted)) +> +> -(defun notmuch-tag-format-tags (tags &optional face) +> +(defun notmuch-tag-format-tag (tags orig-tags tag) +> + "Format TAG by looking into `notmuch-tag-formats'. + +s/by looking into/according to/ here, too. + +> + +> +TAGS and ORIG-TAGS are lists of the current tags and the original +> +tags; tags which have been deleted (i.e., are in ORIG-TAGS but +> +are not in TAGS) are shown using formats from +> +`notmuch-tag-deleted-formats'; tags which have been added (i.e., +> +are in TAGS but are not in ORIG-TAGS) are shown using formats +> +from `notmuch-tag-added-formats' and tags which have not been +> +changed (the normal case) are shown using formats from +> +`notmuch-tag-formats'" +> + (let* ((formatted-tag (notmuch-tag-format-tag-by-state tag tag nil))) +> + (cond ((not (member tag tags)) +> + (notmuch-tag-format-tag-by-state tag formatted-tag 'deleted)) +> + ((not (member tag orig-tags)) +> + (notmuch-tag-format-tag-by-state tag formatted-tag 'added)) +> + (t +> + formatted-tag)))) +> + +> +(defun notmuch-tag-format-tags (tags orig-tags &optional face) +> "Return a string representing formatted TAGS." +> - (let ((face (or face 'notmuch-tag-face))) +> + (let ((face (or face 'notmuch-tag-face)) +> + (all-tags (sort (delete-dups (append tags orig-tags nil)) #'string<))) +> (notmuch-combine-face-text-property-string +> (mapconcat #'identity +> ;; nil indicated that the tag was deliberately hidden +> - (delq nil (mapcar #'notmuch-tag-format-tag tags)) +> + (delq nil (mapcar +> + (apply-partially #'notmuch-tag-format-tag tags orig-tags) +> + all-tags)) +> " ") +> face +> t))) +> diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el +> index a106e09..7080e6f 100644 +> --- a/emacs/notmuch-tree.el +> +++ b/emacs/notmuch-tree.el +> @@ -704,7 +704,7 @@ unchanged ADDRESS if parsing fails." +> (face (if match +> 'notmuch-tree-match-tag-face +> 'notmuch-tree-no-match-tag-face))) +> - (format format-string (notmuch-tag-format-tags tags face))))))) +> + (format format-string (notmuch-tag-format-tags tags tags face))))))) +> +> (defun notmuch-tree-format-field-list (field-list msg) +> "Format fields of MSG according to FIELD-LIST and return string" +> diff --git a/emacs/notmuch.el b/emacs/notmuch.el +> index 0c767f7..04587c0 100644 +> --- a/emacs/notmuch.el +> +++ b/emacs/notmuch.el +> @@ -754,7 +754,7 @@ non-authors is found, assume that all of the authors match." +> +> ((string-equal field "tags") +> (let ((tags (plist-get result :tags))) +> - (insert (format format-string (notmuch-tag-format-tags tags))))))) +> + (insert (format format-string (notmuch-tag-format-tags tags tags))))))) +> +> (defun notmuch-search-show-result (result &optional pos) +> "Insert RESULT at POS or the end of the buffer if POS is null." +> diff --git a/test/test-lib.el b/test/test-lib.el +> index 37fcb3d..437f83f 100644 +> --- a/test/test-lib.el +> +++ b/test/test-lib.el +> @@ -165,3 +165,8 @@ nothing." +> +> (t +> (notmuch-test-report-unexpected output expected))))) +> + +> +;; For historical reasons, we hide deleted tags by default in the test +> +;; suite +> +(setq notmuch-tag-deleted-formats +> + '((".*" nil))) +> -- +> 1.7.9.1 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2