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 5BE3A431FD8 for ; Thu, 5 Dec 2013 12:04:57 -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 LnamzhBWdBw9 for ; Thu, 5 Dec 2013 12:04:51 -0800 (PST) Received: from mail-we0-f171.google.com (mail-we0-f171.google.com [74.125.82.171]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id A419F431FDC for ; Thu, 5 Dec 2013 12:04:51 -0800 (PST) Received: by mail-we0-f171.google.com with SMTP id q58so16936619wes.2 for ; Thu, 05 Dec 2013 12:04:50 -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=etUBDEcFj4QkWcclW/YFdwqjR5XbIOwXJamXAHPBG/w=; b=0h0OXuJMCpZs/WsSca1U+8lwzvfu5lTs92uP4WEb+lehAz9ugUGbC0sOH6QrpCTs+Z RA1mRTbczhcbP7VZ/ibDphjRzR6YbA4VdmqUzBTHOCnbZwSxV4Tg1xEW7/EEj7hQF4R2 xJ7A9vXX6wXUzOoYfWbqotXr7/g1RjyMHwMKW+ATAGVIMqoVQbEXx5IS2T4JWX/kSrpn O2y/o/2rr4PRMhfKMCrV0rE1+8onUxjLxo9vxXp+2jq1OK3CgWuXgm1FvSZp7N0D+7ay RjdGJIPL9fAYQ5SYY0083v1A5REQPghL+5PZIfvCrC4RN02A69k1DvxBzTVBCnrITBzI ZhDg== X-Received: by 10.180.80.233 with SMTP id u9mr550165wix.6.1386273890622; Thu, 05 Dec 2013 12:04:50 -0800 (PST) Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) by mx.google.com with ESMTPSA id n6sm9413418wix.3.2013.12.05.12.04.49 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 05 Dec 2013 12:04:50 -0800 (PST) From: Mark Walters To: notmuch@notmuchmail.org Subject: [PATCH WIP v3 2/3] emacs: show: add an update seen function to post-command-hook Date: Thu, 5 Dec 2013 20:04:30 +0000 Message-Id: <1386273871-24214-3-git-send-email-markwalters1009@gmail.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1386273871-24214-1-git-send-email-markwalters1009@gmail.com> References: <1386273871-24214-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: Thu, 05 Dec 2013 20:04:57 -0000 Add a function stub for updating seen messages to the post-command-hook. This dummy function gets called with parameters the start and end of the current window and can decide what to mark seen based on that. Since this is in the post-command-hook it should get called after most user actions (exceptions include user resizing the window) so it should be possible to make sure the seen status gets updated whether the user uses notmuch commands like next-message or normal emacs commands like scroll-up. It also removes all of the old mark read/seen points to give a clean slate for testing new mark read/seen algorithms. --- emacs/notmuch-show.el | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-) diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index d64d407..7d0ac5d 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -1164,6 +1164,8 @@ function is used." (let ((inhibit-read-only t)) (notmuch-show-mode) + (add-hook 'post-command-hook #'notmuch-show-command-hook nil t) + ;; Don't track undo information for this buffer (set 'buffer-undo-list t) @@ -1549,6 +1551,16 @@ marked as unread, i.e. the tag changes in (apply 'notmuch-show-tag-message (notmuch-tag-change-list notmuch-show-mark-read-tags unread)))) +(defun notmuch-show-do-seen (start end) + "Update seen status for all messages between start and end." + ) + +(defun notmuch-show-command-hook () + (when (eq major-mode 'notmuch-show-mode) + ;; We need to redisplay to get window-start and window-end correct. + (redisplay) + (notmuch-show-do-seen (window-start) (window-end)))) + ;; Functions for getting attributes of several messages in the current ;; thread. @@ -1684,9 +1696,7 @@ If a prefix argument is given and this is the last message in the 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-message-adjust)) + (notmuch-show-message-adjust) (if pop-at-end (notmuch-show-next-thread) (goto-char (point-max))))) @@ -1697,7 +1707,6 @@ 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-message-adjust)) (defun notmuch-show-next-open-message (&optional pop-at-end) @@ -1712,9 +1721,7 @@ to show, nil otherwise." (while (and (setq r (notmuch-show-goto-message-next)) (not (notmuch-show-message-visible-p)))) (if r - (progn - (notmuch-show-mark-read) - (notmuch-show-message-adjust)) + (notmuch-show-message-adjust) (if pop-at-end (notmuch-show-next-thread) (goto-char (point-max)))) @@ -1727,9 +1734,7 @@ to show, nil otherwise." (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)) + (notmuch-show-message-adjust) (goto-char (point-max))))) (defun notmuch-show-open-if-matched () @@ -1740,8 +1745,7 @@ to show, nil otherwise." (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) + (unless (notmuch-show-message-visible-p) (notmuch-show-next-open-message)) (when (eobp) ;; There are no matched non-excluded messages so open all matched @@ -1749,8 +1753,7 @@ to show, nil otherwise." (notmuch-show-mapc 'notmuch-show-open-if-matched) (force-window-update) (goto-char (point-min)) - (if (notmuch-show-message-visible-p) - (notmuch-show-mark-read) + (unless (notmuch-show-message-visible-p) (notmuch-show-next-open-message)))) (defun notmuch-show-previous-open-message () @@ -1760,7 +1763,6 @@ 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-message-adjust)) (defun notmuch-show-view-raw-message () -- 1.7.9.1