From 6e6cb68b804de9e5234bfadaeec3e4b7b4075251 Mon Sep 17 00:00:00 2001
From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>
Date: Sun, 6 Nov 2011 13:03:59 +0400
Subject: [PATCH] emacs: improve hidden signatures handling in
notmuch-show-advance-and-archive
Use `previous-single-char-property-change' instead of going
through each character by hand and testing it's visibility. This
fixes `notmuch-show-advance-and-archive' to work for the last
message in thread with hidden signature.
---
emacs/notmuch-show.el | 17 +++++++++--------
test/emacs | 1 -
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 440e089e..b70dbfb2 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -1152,17 +1152,18 @@ thread, (remove the \"inbox\" tag from each message). Also kill
this buffer, and display the next thread from the search from
which this thread was originally shown."
(interactive)
- (let ((end-of-this-message (notmuch-show-message-bottom)))
+ (let* ((end-of-this-message (notmuch-show-message-bottom))
+ (visible-end-of-this-message (1- end-of-this-message)))
+ (while (invisible-p visible-end-of-this-message)
+ (setq visible-end-of-this-message
+ (previous-single-char-property-change visible-end-of-this-message
+ 'invisible)))
(cond
;; Ideally we would test `end-of-this-message' against the result
;; of `window-end', but that doesn't account for the fact that
- ;; the end of the message might be hidden, so we have to actually
- ;; go to the end, walk back over invisible text and then see if
- ;; point is visible.
- ((save-excursion
- (goto-char (- end-of-this-message 1))
- (notmuch-show-move-past-invisible-backward)
- (> (point) (window-end)))
+ ;; the end of the message might be hidden.
+ ((and visible-end-of-this-message
+ (> visible-end-of-this-message (window-end)))
;; The bottom of this message is not visible - scroll.
(scroll-up nil))
diff --git a/test/emacs b/test/emacs
index 76b18e7d..1aa5299a 100755
--- a/test/emacs
+++ b/test/emacs
@@ -369,7 +369,6 @@ test_emacs "(notmuch-show \"id:$id\") \
test_expect_equal_file OUTPUT EXPECTED
test_begin_subtest 'notmuch-show-advance-and-archive with invisible signature'
-test_subtest_known_broken
message1='id:20091118010116.GC25380@dottiness.seas.harvard.edu'
message2='id:1258491078-29658-1-git-send-email-dottedmag@dottedmag.net'
test_emacs "(notmuch-search \"$message1 or $message2\")
--
2.45.2