aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Bremner <david@tethera.net>2021-06-26 09:04:28 -0300
committerDavid Bremner <david@tethera.net>2021-06-27 14:41:23 -0300
commit37f84d6d2181e26eb2f1413df774cc7922ddd018 (patch)
tree3d1f1eaad3bcb0267e71cf9b5a35469ce9c39033
parent563b2a0032124c313fce0b52be2e62c75bc55d60 (diff)
emacs/tree use notmuch-show-single-message
This is more efficient than notmuch-show-only-matching-messages, since we do not parse the potentially large thread structure to find a single message. This is only a partial fix for notmuch-tree view, because displaying the thread structure in the tree-mode window still crashes on long threads. It is however enough to make unthreaded view handle long threads.
-rw-r--r--emacs/notmuch-tree.el6
-rwxr-xr-xtest/T465-emacs-unthreaded.sh1
2 files changed, 4 insertions, 3 deletions
diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el
index 00ee78d6..56863701 100644
--- a/emacs/notmuch-tree.el
+++ b/emacs/notmuch-tree.el
@@ -575,7 +575,7 @@ NOT change the database."
(with-selected-window notmuch-tree-message-window
(let (;; Since we are only displaying one message do not indent.
(notmuch-show-indent-messages-width 0)
- (notmuch-show-only-matching-messages t)
+ (notmuch-show-single-message t)
;; Ensure that `pop-to-buffer-same-window' uses the
;; window we want it to use.
(display-buffer-overriding-action
@@ -599,7 +599,9 @@ NOT change the database."
(when id
;; We close the window to kill off un-needed buffers.
(notmuch-tree-close-message-window)
- (notmuch-show id))))
+ ;; n-s-s-m is buffer local, so use inner let.
+ (let ((notmuch-show-single-message t))
+ (notmuch-show id)))))
(defun notmuch-tree-show-message (arg)
"Show the current message.
diff --git a/test/T465-emacs-unthreaded.sh b/test/T465-emacs-unthreaded.sh
index 16ff89a9..f9a09426 100755
--- a/test/T465-emacs-unthreaded.sh
+++ b/test/T465-emacs-unthreaded.sh
@@ -26,7 +26,6 @@ test_emacs '(let ((max-lisp-eval-depth 10))
test_expect_equal_file EXPECTED.unthreaded OUTPUT
test_begin_subtest "message from large thread (status)"
-test_subtest_known_broken
output=$(test_emacs '(let ((max-lisp-eval-depth 10))
(notmuch-unthreaded "subject:large-thread")
(notmuch-test-wait)