From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id CA38B429E5B for ; Tue, 31 Jan 2012 00:47:16 -0800 (PST) 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 k437k3pL1QPy for ; Tue, 31 Jan 2012 00:47:14 -0800 (PST) Received: from mail-we0-f181.google.com (mail-we0-f181.google.com [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 0454E417347 for ; Tue, 31 Jan 2012 00:47:07 -0800 (PST) Received: by mail-we0-f181.google.com with SMTP id b10so4655480wer.26 for ; Tue, 31 Jan 2012 00:47:07 -0800 (PST) Received: by 10.216.135.76 with SMTP id t54mr8659069wei.14.1327999627614; Tue, 31 Jan 2012 00:47:07 -0800 (PST) Received: from hotblack-desiato.hh.sledj.net (host81-149-164-25.in-addr.btopenworld.com. [81.149.164.25]) by mx.google.com with ESMTPS id bj10sm35769862wib.9.2012.01.31.00.47.06 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 31 Jan 2012 00:47:06 -0800 (PST) Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000) id D8A27A0336; Tue, 31 Jan 2012 08:47:01 +0000 (GMT) From: David Edmondson To: notmuch@notmuchmail.org Subject: [PATCH 5/5] emacs: Optionally retain the state of the buffer during `notmuch-show-refresh-view'. Date: Tue, 31 Jan 2012 08:47:00 +0000 Message-Id: <1327999620-14595-6-git-send-email-dme@dme.org> X-Mailer: git-send-email 1.7.8.3 In-Reply-To: <1327999620-14595-1-git-send-email-dme@dme.org> References: <1327999620-14595-1-git-send-email-dme@dme.org> 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, 31 Jan 2012 08:47:17 -0000 With an argument, record and reply the state of the buffer during `notmuch-show-refresh-view'. In this context, "state" is defined as: - the open/closed state of each message, - the current message. Traditional use of refresh with the = key does not retain the state. The recently introduced toggle commands ($, !, < and >) do retain the state. --- emacs/notmuch-show.el | 58 +++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 49 insertions(+), 9 deletions(-) diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index 28f2148..2f10c42 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -933,7 +933,7 @@ current buffer, if possible." (message (if notmuch-show-process-crypto "Processing cryptographic MIME parts." "Not processing cryptographic MIME parts.")) - (notmuch-show-refresh-view)) + (notmuch-show-refresh-view t)) (defun notmuch-show-toggle-elide-non-matching () "Toggle the display of non-matching messages." @@ -942,7 +942,7 @@ current buffer, if possible." (message (if notmuch-show-elide-non-matching-messages "Showing matching messages only." "Showing all messages.")) - (notmuch-show-refresh-view)) + (notmuch-show-refresh-view t)) (defun notmuch-show-toggle-thread-indentation () "Toggle the indentation of threads." @@ -951,7 +951,7 @@ current buffer, if possible." (message (if notmuch-show-indent-content "Content is indented." "Content is not indented.")) - (notmuch-show-refresh-view)) + (notmuch-show-refresh-view t)) (defun notmuch-show-insert-tree (tree depth) "Insert the message tree TREE at depth DEPTH in the current thread." @@ -1054,15 +1054,55 @@ function is used." (notmuch-show-mark-read))) -(defun notmuch-show-refresh-view () +(defun notmuch-show-capture-state () + "Capture the state of the current buffer. + +This includes: + - the list of open messages, + - the current message." + (list (notmuch-show-get-message-id) (notmuch-show-get-message-ids-for-open-messages))) + +(defun notmuch-show-apply-state (state) + "Apply STATE to the current buffer. + +This includes: + - opening the messages previously opened, + - closing all other messages, + - moving to the correct current message." + (let ((current (car state)) + (open (cadr state))) + + ;; Open those that were open. + (goto-char (point-min)) + (loop do (notmuch-show-message-visible (notmuch-show-get-message-properties) + (member (notmuch-show-get-message-id) open)) + until (not (notmuch-show-goto-message-next))) + + ;; Go to the previously open message. + (goto-char (point-min)) + (unless (loop if (string= current (notmuch-show-get-message-id)) + return t + until (not (notmuch-show-goto-message-next))) + (goto-char (point-min)) + (message "Previously current message not found.")) + (notmuch-show-message-adjust))) + +(defun notmuch-show-refresh-view (&optional retain-state) "Refresh the current view. -Refreshes the current view, observing changes in cryptographic preferences." +Refreshes the current view, observing changes in display +preferences. If RETAIN-STATE is non-nil then the state of the +buffer is stored and re-applied after the refresh." (interactive) - (let ((inhibit-read-only t)) - (erase-buffer)) - (notmuch-show-worker notmuch-show-thread-id notmuch-show-parent-buffer - notmuch-show-query-context)) + (let ((inhibit-read-only t) + state) + (if retain-state + (setq state (notmuch-show-capture-state))) + (erase-buffer) + (notmuch-show-worker notmuch-show-thread-id notmuch-show-parent-buffer + notmuch-show-query-context) + (if state + (notmuch-show-apply-state state)))) (defvar notmuch-show-stash-map (let ((map (make-sparse-keymap))) -- 1.7.8.3