[Patch v6 12/13] emacs: show: recognize the exclude flag.

diff --git a/6a/eef78cfe2e664abd9fc01f4b109db075d6b087 b/6a/eef78cfe2e664abd9fc01f4b109db075d6b087
new file mode 100644 (file)
index 0000000..138e023
--- /dev/null
+++ b/6a/eef78cfe2e664abd9fc01f4b109db075d6b087
@@ -0,0 +1,124 @@
+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 DCF14431FBF\r
+       for <notmuch@notmuchmail.org>; Sat, 25 Feb 2012 19:17: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 jz145VHHhhoQ for <notmuch@notmuchmail.org>;\r
+       Sat, 25 Feb 2012 19:17:55 -0800 (PST)\r
+Received: from mail-we0-f181.google.com (mail-we0-f181.google.com\r
+       [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 4B4FA431FAE\r
+       for <notmuch@notmuchmail.org>; Sat, 25 Feb 2012 19:17:55 -0800 (PST)\r
+Received: by werp13 with SMTP id p13so2550292wer.26\r
+       for <notmuch@notmuchmail.org>; Sat, 25 Feb 2012 19:17:54 -0800 (PST)\r
+Received-SPF: pass (google.com: domain of markwalters1009@gmail.com designates\r
+       10.180.101.200 as permitted sender) client-ip=10.180.101.200; \r
+Authentication-Results: mr.google.com; spf=pass (google.com: domain of\r
+       markwalters1009@gmail.com designates 10.180.101.200 as\r
+       permitted sender) smtp.mail=markwalters1009@gmail.com;\r
+       dkim=pass header.i=markwalters1009@gmail.com\r
+Received: from mr.google.com ([10.180.101.200])\r
+       by 10.180.101.200 with SMTP id fi8mr16926240wib.20.1330226274182\r
+       (num_hops = 1); Sat, 25 Feb 2012 19:17:54 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=y8Cn2mSbzbMeIcOfFPJoIgXa1ASnjb9usGZdKfkhBvo=;\r
+       b=tHR+E+8Ys+JVjnAcOL7P+yJwn1frL4UL5aJANQE05jtsqoA9R2lz45i+OJyxgw/io7\r
+       h/Oy5VkR5Stp8Vimi9OEUucIEm7EpgNtOmXppjwsIXjYHFILyWYw/IPthH2EjX4FOszR\r
+       kDkLO9XfO0Y71I5UKEGD00/hcJBi+pN8PlKNw=\r
+Received: by 10.180.101.200 with SMTP id fi8mr9156976wib.20.1330157154032;\r
+       Sat, 25 Feb 2012 00:05:54 -0800 (PST)\r
+Received: from localhost (94-192-233-223.zone6.bethere.co.uk.\r
+ [94.192.233.223])     by mx.google.com with ESMTPS id\r
+ m16sm20600151wie.9.2012.02.25.00.05.52        (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sat, 25 Feb 2012 00:05:53 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org,\r
+       Austin Clements <amdragon@MIT.EDU>\r
+Subject: [Patch v6 12/13] emacs: show: recognize the exclude flag.\r
+Date: Sat, 25 Feb 2012 08:06:43 +0000\r
+Message-Id: <1330157204-26094-13-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.2.3\r
+In-Reply-To: <1330157204-26094-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1330157204-26094-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: Sun, 26 Feb 2012 03:17:56 -0000\r
+\r
+Show mode will recognize the exclude flag by not opening excluding\r
+messages by default, and will start at the first matching non-excluded\r
+message. If there are no matching non-excluded messages it will go to\r
+the first matching (necessarily excluded) message.\r
+---\r
+ emacs/notmuch-show.el |   19 ++++++++++++++++++-\r
+ 1 files changed, 18 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index aa9ccee..96b0c71 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -948,7 +948,8 @@ current buffer, if possible."\r
+ \r
+     ;; Message visibility depends on whether it matched the search\r
+     ;; criteria.\r
+-    (notmuch-show-message-visible msg (plist-get msg :match))))\r
++    (notmuch-show-message-visible msg (and (plist-get msg :match)\r
++                                         (not (plist-get msg :excluded))))))\r
+ \r
+ (defun notmuch-show-toggle-process-crypto ()\r
+   "Toggle the processing of cryptographic MIME parts."\r
+@@ -1079,6 +1080,10 @@ function is used."\r
+     ;; Move straight to the first open message\r
+     (unless (notmuch-show-message-visible-p)\r
+       (notmuch-show-next-open-message))\r
++    (when (eobp)\r
++      (goto-char (point-min))\r
++      (unless (notmuch-show-get-prop :match)\r
++      (notmuch-show-next-matching-message)))\r
+ \r
+     ;; Set the header line to the subject of the first open message.\r
+     (setq header-line-format (notmuch-show-strip-re (notmuch-show-get-pretty-subject)))\r
+@@ -1557,6 +1562,18 @@ to show, nil otherwise."\r
+       (goto-char (point-max))))\r
+     r))\r
+ \r
++(defun notmuch-show-next-matching-message ()\r
++  "Show the next matching message."\r
++  (interactive)\r
++  (let (r)\r
++    (while (and (setq r (notmuch-show-goto-message-next))\r
++              (not (notmuch-show-get-prop :match))))\r
++    (if r\r
++      (progn\r
++        (notmuch-show-mark-read)\r
++        (notmuch-show-message-adjust))\r
++      (goto-char (point-max)))))\r
++\r
+ (defun notmuch-show-previous-open-message ()\r
+   "Show the previous open message."\r
+   (interactive)\r
+-- \r
+1.7.2.3\r
+\r