From: Mark Walters Date: Wed, 29 Feb 2012 09:17:56 +0000 (+0000) Subject: Re: [Patch v6 12/13] emacs: show: recognize the exclude flag. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=e52ccc9204ab48b35081be0a45f75979fb12764a;p=notmuch-archives.git Re: [Patch v6 12/13] emacs: show: recognize the exclude flag. --- diff --git a/e1/7f82b29db3e430baf4bd89907d1dcd32e25d8b b/e1/7f82b29db3e430baf4bd89907d1dcd32e25d8b new file mode 100644 index 000000000..23e692b65 --- /dev/null +++ b/e1/7f82b29db3e430baf4bd89907d1dcd32e25d8b @@ -0,0 +1,171 @@ +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 E8735431FAF + for ; Wed, 29 Feb 2012 01:16:15 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -1.098 +X-Spam-Level: +X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5 + tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001, + NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 AJvkGtki8cwH for ; + Wed, 29 Feb 2012 01:16:15 -0800 (PST) +Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 3755E431FAE + for ; Wed, 29 Feb 2012 01:16:15 -0800 (PST) +Received: from smtp.qmul.ac.uk ([138.37.6.40]) + by mail2.qmul.ac.uk with esmtp (Exim 4.71) + (envelope-from ) + id 1S2fdq-0005Vp-50; Wed, 29 Feb 2012 09:16:10 +0000 +Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223] + helo=localhost) + by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69) + (envelope-from ) + id 1S2fdp-0005pg-QV; Wed, 29 Feb 2012 09:16:10 +0000 +From: Mark Walters +To: notmuch@notmuchmail.org, Austin Clements +Subject: Re: [Patch v6 12/13] emacs: show: recognize the exclude flag. +In-Reply-To: <1330157204-26094-13-git-send-email-markwalters1009@gmail.com> +References: <1330157204-26094-1-git-send-email-markwalters1009@gmail.com> + <1330157204-26094-13-git-send-email-markwalters1009@gmail.com> +User-Agent: Notmuch/0.11.1+202~g31eaf97 (http://notmuchmail.org) Emacs/23.2.1 + (i486-pc-linux-gnu) +Date: Wed, 29 Feb 2012 09:17:56 +0000 +Message-ID: <87linmvvzv.fsf@qmul.ac.uk> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Sender-Host-Address: 94.192.233.223 +X-QM-SPAM-Info: Sender has good ham record. :) +X-QM-Body-MD5: d9d1a01330af159c833c1b49d4d94cfb (of first 20000 bytes) +X-SpamAssassin-Score: -1.8 +X-SpamAssassin-SpamBar: - +X-SpamAssassin-Report: The QM spam filters have analysed this message to + determine if it is + spam. We require at least 5.0 points to mark a message as spam. + This message scored -1.8 points. + Summary of the scoring: + * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, + * medium trust + * [138.37.6.40 listed in list.dnswl.org] + * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail + provider * (markwalters1009[at]gmail.com) + * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay + * domain + * 0.5 AWL AWL: From: address is in the auto white-list +X-QM-Scan-Virus: ClamAV says the message is clean +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: Wed, 29 Feb 2012 09:16:16 -0000 + + +The rest of the series still applies to master (bf28c60b9) but this patch +needed rebasing/restructuring to fit with the Austin's keep-state patch. + +I attach the new patch below. Of course, if it is easier I can resend +the whole series. + +Best wishes + +Mark + +>From 8324bc91e43d04e4c2813fa2a714766bcd057256 Mon Sep 17 00:00:00 2001 +From: Mark Walters +Date: Sun, 29 Jan 2012 16:32:55 +0000 +Subject: [PATCH] emacs: show: recognize the exclude flag. + +Show mode will recognize the exclude flag by not opening excluding +messages by default, and will start at the first matching non-excluded +message. If there are no matching non-excluded messages it will go to +the first matching (necessarily excluded) message. +--- + emacs/notmuch-show.el | 36 +++++++++++++++++++++++++++--------- + 1 files changed, 27 insertions(+), 9 deletions(-) + +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index 2cca2e2..72a8a6e 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -981,7 +981,8 @@ current buffer, if possible." + + ;; Message visibility depends on whether it matched the search + ;; criteria. +- (notmuch-show-message-visible msg (plist-get msg :match)))) ++ (notmuch-show-message-visible msg (and (plist-get msg :match) ++ (not (plist-get msg :excluded)))))) + + (defun notmuch-show-toggle-process-crypto () + "Toggle the processing of cryptographic MIME parts." +@@ -1081,11 +1082,7 @@ function is used." + notmuch-show-parent-buffer parent-buffer + notmuch-show-query-context query-context) + (notmuch-show-build-buffer) +- +- ;; Move to the first open message and mark it read +- (if (notmuch-show-message-visible-p) +- (notmuch-show-mark-read) +- (notmuch-show-next-open-message)))) ++ (notmuch-show-goto-first-wanted-message))) + + (defun notmuch-show-build-buffer () + (let ((inhibit-read-only t)) +@@ -1167,9 +1164,7 @@ reset based on the original query." + (notmuch-show-apply-state state) + ;; We're resetting state, so navigate to the first open message + ;; and mark it read, just like opening a new show buffer. +- (if (notmuch-show-message-visible-p) +- (notmuch-show-mark-read) +- (notmuch-show-next-open-message))))) ++ (notmuch-show-goto-first-wanted-message)))) + + (defvar notmuch-show-stash-map + (let ((map (make-sparse-keymap))) +@@ -1601,6 +1596,29 @@ to show, nil otherwise." + (goto-char (point-max)))) + r)) + ++(defun notmuch-show-next-matching-message () ++ "Show the next matching message." ++ (interactive) ++ (let (r) ++ (while (and (setq r (notmuch-show-goto-message-next)) ++ (not (notmuch-show-get-prop :match)))) ++ (if r ++ (progn ++ (notmuch-show-mark-read) ++ (notmuch-show-message-adjust)) ++ (goto-char (point-max))))) ++ ++(defun notmuch-show-goto-first-wanted-message () ++ "Move to the first open message and mark it read" ++ (goto-char (point-min)) ++ (if (notmuch-show-message-visible-p) ++ (notmuch-show-mark-read) ++ (notmuch-show-next-open-message)) ++ (when (eobp) ++ (goto-char (point-min)) ++ (unless (notmuch-show-get-prop :match) ++ (notmuch-show-next-matching-message)))) ++ + (defun notmuch-show-previous-open-message () + "Show the previous open message." + (interactive) +-- +1.7.2.3 +