From: Mark Walters Date: Sun, 1 Dec 2013 10:02:25 +0000 (+0000) Subject: [PATCH WIP v2 4/6] emacs: show: use the `seen' interface X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fad52be05858f21741ed7a0a27f9deb4e1839fd8;p=notmuch-archives.git [PATCH WIP v2 4/6] emacs: show: use the `seen' interface --- diff --git a/ce/00e6d2c94c65d267e8906d5929b80e4602054e b/ce/00e6d2c94c65d267e8906d5929b80e4602054e new file mode 100644 index 000000000..a6d44da27 --- /dev/null +++ b/ce/00e6d2c94c65d267e8906d5929b80e4602054e @@ -0,0 +1,141 @@ +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 6C61F431E62 + for ; Sun, 1 Dec 2013 02:02:46 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.201 +X-Spam-Level: +X-Spam-Status: No, score=0.201 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, + 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 ck0ov9o2K5OL for ; + Sun, 1 Dec 2013 02:02:39 -0800 (PST) +Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com + [74.125.82.43]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client + certificate requested) by olra.theworths.org (Postfix) with ESMTPS id + B2347431FD0 for ; Sun, 1 Dec 2013 02:02:39 -0800 + (PST) +Received: by mail-wg0-f43.google.com with SMTP id k14so8269352wgh.22 + for ; Sun, 01 Dec 2013 02:02:38 -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:in-reply-to:references; + bh=IxSu4E7/TxM+kEfjDFryHbuZhM/ButuOcnzl4j59b8k=; + b=cLT83rGPNsyXixiT6NIgSMDEzDEuwQTXuKco+Vi/AVSYiNWKKwtCUiXHKAYnkOqkIH + YACHN1rdT1WfhYpqm3f8KZF36XZUt4OU8wEWIDFKOiI131pwUFUe6iq8XYuNFcOkNSPG + QYNnStGCltXIUsEqR3YPeh1MJq4nuPR6HBxfD7KO8A2sEmx4ZT88LhfQWjQrgAILgImz + 7WP0zLocTZAMtDxESNV+MIJjCA+8PSD436WONsfgF7dd5txd9F4Sz+gXwWBizLqlxpNl + gI9OFlgE88GSs0ilUXRVszZAQQfbKd606W5Ui0qxurIFKc/9Gcd7buSe3bJdfWfy+dAB + b3+g== +X-Received: by 10.180.39.140 with SMTP id p12mr13613142wik.12.1385892158691; + Sun, 01 Dec 2013 02:02:38 -0800 (PST) +Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) + by mx.google.com with ESMTPSA id + hv5sm110300592wib.2.2013.12.01.02.02.37 for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Sun, 01 Dec 2013 02:02:38 -0800 (PST) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH WIP v2 4/6] emacs: show: use the `seen' interface +Date: Sun, 1 Dec 2013 10:02:25 +0000 +Message-Id: <1385892147-16994-5-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1385892147-16994-1-git-send-email-markwalters1009@gmail.com> +References: <1385892147-16994-1-git-send-email-markwalters1009@gmail.com> +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: Sun, 01 Dec 2013 10:02:46 -0000 + +This converts the existing logic to use the seen/read distinction. At +this point the logic for deciding whether to mark seen/read is +unchanged, but the actual tagging read is now deferred to +quit/refresh. +--- + emacs/notmuch-show.el | 14 +++++++------- + 1 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index 05f649b..261c2e3 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -1721,7 +1721,7 @@ thread, navigate to the next thread in the parent search buffer." + (interactive "P") + (if (notmuch-show-goto-message-next) + (progn +- (notmuch-show-mark-read) ++ (notmuch-show-mark-seen) + (notmuch-show-message-adjust)) + (if pop-at-end + (notmuch-show-next-thread) +@@ -1733,7 +1733,7 @@ thread, navigate to the next thread in the parent search buffer." + (if (= (point) (notmuch-show-message-top)) + (notmuch-show-goto-message-previous) + (notmuch-show-move-to-message-top)) +- (notmuch-show-mark-read) ++ (notmuch-show-mark-seen) + (notmuch-show-message-adjust)) + + (defun notmuch-show-next-open-message (&optional pop-at-end) +@@ -1749,7 +1749,7 @@ to show, nil otherwise." + (not (notmuch-show-message-visible-p)))) + (if r + (progn +- (notmuch-show-mark-read) ++ (notmuch-show-mark-seen) + (notmuch-show-message-adjust)) + (if pop-at-end + (notmuch-show-next-thread) +@@ -1764,7 +1764,7 @@ to show, nil otherwise." + (not (notmuch-show-get-prop :match)))) + (if r + (progn +- (notmuch-show-mark-read) ++ (notmuch-show-mark-seen) + (notmuch-show-message-adjust)) + (goto-char (point-max))))) + +@@ -1777,7 +1777,7 @@ to show, nil otherwise." + "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-mark-seen) + (notmuch-show-next-open-message)) + (when (eobp) + ;; There are no matched non-excluded messages so open all matched +@@ -1786,7 +1786,7 @@ to show, nil otherwise." + (force-window-update) + (goto-char (point-min)) + (if (notmuch-show-message-visible-p) +- (notmuch-show-mark-read) ++ (notmuch-show-mark-seen) + (notmuch-show-next-open-message)))) + + (defun notmuch-show-previous-open-message () +@@ -1796,7 +1796,7 @@ to show, nil otherwise." + (notmuch-show-goto-message-previous) + (notmuch-show-move-to-message-top)) + (not (notmuch-show-message-visible-p)))) +- (notmuch-show-mark-read) ++ (notmuch-show-mark-seen) + (notmuch-show-message-adjust)) + + (defun notmuch-show-view-raw-message () +-- +1.7.9.1 +