From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Subject: [PATCH 3/6] emacs: replace use of hook to draw hl-line in search mode
Date: Sat, 10 Aug 2024 14:36:22 -0300 [thread overview]
Message-ID: <20240810174121.425192-4-david@tethera.net> (raw)
In-Reply-To: <20240810174121.425192-1-david@tethera.net>
In the thread at id:87fsfuuxwn.fsf@thinkbox, a bug is discussed where
the point and hl-line overlay get out of sync, leading the user to
open the wrong message. As far as I can tell this is caused by
notmuch-hl-mode being invoked too early.
This change bypasses the logic preventing notmuch-search-hook being
called only once, so that the overlay is updated later after after the
buffer is full(er).
This change may lead to the overlay being updated multiple times; if
this is annoying we can add a similar buffer local variable to ensure
it is only called once.
The extra logic to check notmuch-search-target-line reduces the
flicker somewhat by not highlighting the first line every time.
---
emacs/notmuch.el | 8 ++++++--
test/T312-emacs-hl-line.sh | 2 --
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index 934ec894..2d7e0422 100644
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -126,10 +126,9 @@ there will be called at other points of notmuch execution."
:type 'file
:group 'notmuch)
-(defcustom notmuch-search-hook '(notmuch-hl-line-mode)
+(defcustom notmuch-search-hook nil
"List of functions to call when notmuch displays the search results."
:type 'hook
- :options '(notmuch-hl-line-mode)
:group 'notmuch-search
:group 'notmuch-hooks)
@@ -930,6 +929,11 @@ sets the :orig-tag property."
(notmuch-sexp-parse-partial-list 'notmuch-search-append-result
results-buf))
(with-current-buffer results-buf
+ (when (and notmuch-hl-line
+ (>=
+ (line-number-at-pos (point-max) t)
+ (or notmuch-search-target-line -1)))
+ (notmuch-hl-line-mode))
(notmuch--search-hook-wrapper)))))
;;; Commands (and some helper functions used by them)
diff --git a/test/T312-emacs-hl-line.sh b/test/T312-emacs-hl-line.sh
index 4cceed30..4697b671 100755
--- a/test/T312-emacs-hl-line.sh
+++ b/test/T312-emacs-hl-line.sh
@@ -104,7 +104,6 @@ test_emacs_expect_t '(let ((notmuch-hl-line t))
(line-number-at-pos (overlay-start hl-line-overlay)) 12))'
test_begin_subtest "line 12, search, refresh"
-test_subtest_known_broken
test_emacs_expect_t '(let ((notmuch-hl-line t))
(notmuch-search "tag:inbox")
(notmuch-test-wait)
@@ -140,7 +139,6 @@ test_emacs_expect_t '(let ((notmuch-hl-line t))
(line-number-at-pos (overlay-start hl-line-overlay)) 12))'
test_begin_subtest "hl-line disabled, search"
-test_subtest_known_broken
test_emacs_expect_t '(let ((notmuch-hl-line nil))
(notmuch-search "tag:inbox")
(notmuch-test-wait)
--
2.43.0
next prev parent reply other threads:[~2024-08-10 17:42 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-10 17:36 hl-line fixes David Bremner
2024-08-10 17:36 ` [PATCH 1/6] emacs: add defcustom to control hl-line mode David Bremner
2024-08-10 17:36 ` [PATCH 2/6] test/emacs: add tests for hl-line-mode integration David Bremner
2024-08-10 17:36 ` David Bremner [this message]
2024-08-10 17:36 ` [PATCH 4/6] emacs/tree: condition hl-line-mode on notmuch-hl-line David Bremner
2024-08-10 17:36 ` [PATCH 5/6] emacs/tree: call notmuch-hl-line-mode from tree-sentinel David Bremner
2024-08-10 17:36 ` [PATCH 6/6] emacs/tree: add call to notmuch-hl-line-mode from process-filter David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240810174121.425192-4-david@tethera.net \
--to=david@tethera.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).