From 0d5b6a4440cee693575e7ff7d1b626c92a5230d2 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Wed, 4 Sep 2013 17:45:18 +2000 Subject: [PATCH] [PATCH v2 2/9] emacs: Refresh hello whenever the user switches to the buffer --- e3/c11d8892952b0fc3a77957f3d95d9cb7abe322 | 190 ++++++++++++++++++++++ 1 file changed, 190 insertions(+) create mode 100644 e3/c11d8892952b0fc3a77957f3d95d9cb7abe322 diff --git a/e3/c11d8892952b0fc3a77957f3d95d9cb7abe322 b/e3/c11d8892952b0fc3a77957f3d95d9cb7abe322 new file mode 100644 index 000000000..be72f617b --- /dev/null +++ b/e3/c11d8892952b0fc3a77957f3d95d9cb7abe322 @@ -0,0 +1,190 @@ +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 1A122429E56 + for ; Tue, 3 Sep 2013 14:46:10 -0700 (PDT) +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 oeCQnyX7fwwh for ; + Tue, 3 Sep 2013 14:46:04 -0700 (PDT) +Received: from dmz-mailsec-scanner-8.mit.edu (dmz-mailsec-scanner-8.mit.edu + [18.7.68.37]) + by olra.theworths.org (Postfix) with ESMTP id 350A1431FD8 + for ; Tue, 3 Sep 2013 14:45:42 -0700 (PDT) +X-AuditID: 12074425-b7f0c8e000000953-c5-52265885fcd2 +Received: from mailhub-auth-2.mit.edu ( [18.7.62.36]) + by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP + id 48.EF.02387.58856225; Tue, 3 Sep 2013 17:45:41 -0400 (EDT) +Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) + by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id r83LjU4s019872; + Tue, 3 Sep 2013 17:45:30 -0400 +Received: from drake.dyndns.org (26-4-182.dynamic.csail.mit.edu [18.26.4.182]) + (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id r83LjRvf026852 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Tue, 3 Sep 2013 17:45:28 -0400 +Received: from amthrax by drake.dyndns.org with local (Exim 4.77) + (envelope-from ) + id 1VGyPe-0004xq-Su; Tue, 03 Sep 2013 17:45:26 -0400 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH v2 2/9] emacs: Refresh hello whenever the user switches to the + buffer +Date: Tue, 3 Sep 2013 17:45:18 -0400 +Message-Id: <1378244725-18846-3-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1378244725-18846-1-git-send-email-amdragon@mit.edu> +References: <1378244725-18846-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFjrGIsWRmVeSWpSXmKPExsUixG6notsaoRZkcP6LkUXTdGeL1XN5LK7f + nMnswOyxc9Zddo9b91+zezxbdYs5gDmKyyYlNSezLLVI3y6BK+PDjWmsBXtUK3ovXmZvYFwp + 18XIySEhYCLxuv8ME4QtJnHh3nq2LkYuDiGBfYwSV7c/ZoRwNjBK3N/fwQ7hHGaSmHzpO1Rm + LqPEi7PzwfrZBDQktu1fzghiiwhIS+y8O5sVxGYWiJY4cnkGG4gtLBAqcf7sTWYQm0VAVeLv + oalgNbwCDhIPd/6FukNRovvZBLB6TgFHid4Fi9hBbCGgmqaVl9knMPIvYGRYxSibklulm5uY + mVOcmqxbnJyYl5dapGuhl5tZopeaUrqJERxcLqo7GCccUjrEKMDBqMTDu+K+apAQa2JZcWXu + IUZJDiYlUd4joWpBQnxJ+SmVGYnFGfFFpTmpxYcYJTiYlUR4E3yAcrwpiZVVqUX5MClpDhYl + cd7nT88GCgmkJ5akZqemFqQWwWRlODiUJHjfhwM1ChalpqdWpGXmlCCkmTg4QYbzAA1/CVLD + W1yQmFucmQ6RP8WoKCXOexskIQCSyCjNg+uFRf8rRnGgV4R5j4NU8QATB1z3K6DBTECD0z6r + ggwuSURISTUw5vPIMvdnL/2r/rmlKLtbPucPe2bH1/ud9n0HuqXdmvbquZ8p83g818zLXdpA + 7stkRkbrL+3Kt4pbXvj+Nuz6Yjpli49wt9m0n37Cbzc++MKwLIllUqK29sd2z8s9zmx2atd0 + DvCHdH511Xh769GsHxOq6oXig//U7Jw52+vFNt8yY5OyzR1KLMUZiYZazEXFiQAO0JLa2QIA AA== +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, 03 Sep 2013 21:46:10 -0000 + +Previously, we refreshed hello when the user quit a search that was +started from hello. This is fine assuming purely stack-oriented +buffer use, but is quite fragile and requires hacks to search. + +This replaces that logic with a new approach that refreshes hello +whenever the user switches to the hello buffer, regardless of how this +happens. +--- + emacs/notmuch-hello.el | 58 +++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 48 insertions(+), 10 deletions(-) + +diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el +index 9db8c99..24ac1c6 100644 +--- a/emacs/notmuch-hello.el ++++ b/emacs/notmuch-hello.el +@@ -232,6 +232,11 @@ supported for \"Customized queries section\" items." + notmuch-hello-query-section + (function :tag "Custom section")))) + ++(defcustom notmuch-hello-auto-refresh t ++ "Automatically refresh when returning to the notmuch-hello buffer." ++ :group 'notmuch-hello ++ :type 'boolean) ++ + (defvar notmuch-hello-hidden-sections nil + "List of sections titles whose contents are hidden") + +@@ -263,8 +268,7 @@ afterwards.") + (setq search (notmuch-hello-trim search)) + (let ((history-delete-duplicates t)) + (add-to-history 'notmuch-search-history search))) +- (notmuch-search search notmuch-search-oldest-first nil nil +- #'notmuch-hello-search-continuation)) ++ (notmuch-search search notmuch-search-oldest-first)) + + (defun notmuch-hello-add-saved-search (widget) + (interactive) +@@ -322,8 +326,7 @@ diagonal." + (defun notmuch-hello-widget-search (widget &rest ignore) + (notmuch-search (widget-get widget + :notmuch-search-terms) +- notmuch-search-oldest-first +- nil nil #'notmuch-hello-search-continuation)) ++ notmuch-search-oldest-first)) + + (defun notmuch-saved-search-count (search) + (car (process-lines notmuch-command "count" search))) +@@ -476,9 +479,6 @@ Such a list can be computed with `notmuch-hello-query-counts'." + + (defimage notmuch-hello-logo ((:type png :file "notmuch-logo.png"))) + +-(defun notmuch-hello-search-continuation() +- (notmuch-hello-update t)) +- + (defun notmuch-hello-update (&optional no-display) + "Update the current notmuch view." + ;; Lazy - rebuild everything. +@@ -491,6 +491,36 @@ Such a list can be computed with `notmuch-hello-query-counts'." + (notmuch-poll) + (notmuch-hello-update)) + ++(defun notmuch-hello-window-configuration-change () ++ "Hook function to update the hello buffer when it is switched to." ++ (let ((hello-buf (get-buffer "*notmuch-hello*")) ++ (do-refresh nil)) ++ ;; Consider all windows in the currently selected frame, since ++ ;; that's where the configuration change happened. This also ++ ;; refreshes our snapshot of all windows, so we have to do this ++ ;; even if we know we won't refresh (e.g., hello-buf is null). ++ (dolist (window (window-list)) ++ (let ((last-buf (window-parameter window 'notmuch-hello-last-buffer)) ++ (cur-buf (window-buffer window))) ++ (when (not (eq last-buf cur-buf)) ++ ;; This window changed or is new. Update recorded buffer ++ ;; for next time. ++ (set-window-parameter window 'notmuch-hello-last-buffer cur-buf) ++ (when (and (eq cur-buf hello-buf) last-buf) ++ ;; The user just switched to hello in this window (hello ++ ;; is currently visible, was not visible on the last ++ ;; configuration change, and this is not a new window) ++ (setq do-refresh t))))) ++ (when (and do-refresh notmuch-hello-auto-refresh) ++ ;; Refresh hello as soon as we get back to redisplay. On Emacs ++ ;; 24, we can't do it right here because something in this ++ ;; hook's call stack overrides hello's point placement. ++ (run-at-time nil nil #'notmuch-hello t)) ++ (when (null hello-buf) ++ ;; Clean up hook ++ (remove-hook 'window-configuration-change-hook ++ #'notmuch-hello-window-configuration-change)))) ++ + + (defvar notmuch-hello-mode-map + (let ((map (make-sparse-keymap))) +@@ -765,9 +795,17 @@ following: + "Run notmuch and display saved searches, known tags, etc." + (interactive) + +- (if no-display +- (set-buffer "*notmuch-hello*") +- (switch-to-buffer "*notmuch-hello*")) ++ ;; This may cause a window configuration change, so if the ++ ;; auto-refresh hook is already installed, avoid recursive refresh. ++ (let ((notmuch-hello-auto-refresh nil)) ++ (if no-display ++ (set-buffer "*notmuch-hello*") ++ (switch-to-buffer "*notmuch-hello*"))) ++ ++ ;; Install auto-refresh hook ++ (when notmuch-hello-auto-refresh ++ (add-hook 'window-configuration-change-hook ++ #'notmuch-hello-window-configuration-change)) + + (let ((target-line (line-number-at-pos)) + (target-column (current-column)) +-- +1.7.10.4 + -- 2.26.2