From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>
To: notmuch@notmuchmail.org
Subject: Re: [PATCH 2/2] Workaround for Emacs bug #8721.
Date: Fri, 27 May 2011 01:48:10 +0400 [thread overview]
Message-ID: <874o4hp205.fsf@gmail.com> (raw)
In-Reply-To: <1306445915-9474-2-git-send-email-dmitry.kurochkin@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 461 bytes --]
On Fri, 27 May 2011 01:38:35 +0400, Dmitry Kurochkin <dmitry.kurochkin@gmail.com> wrote:
> The patch adds `notmuch-isearch-range-invisible' function which
> is the same as `isearch-range-invisible' but with fixed Emacs bug
> `notmuch-isearch-range-invisible' instead of the original
> `isearch-range-invisible' when in `notmuch-show-mode'.
I've screwed up the commit message because of a line starting with '#'.
Attach is an amended patch.
Regards,
Dmitry
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Workaround-for-Emacs-bug-8721.patch --]
[-- Type: text/x-diff, Size: 3416 bytes --]
From ead308fb53725d593562d7d4e3cd4aa82412aa70 Mon Sep 17 00:00:00 2001
From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>
Date: Fri, 27 May 2011 01:35:09 +0400
Subject: [PATCH] Workaround for Emacs bug #8721.
The patch adds `notmuch-isearch-range-invisible' function which
is the same as `isearch-range-invisible' but with fixed Emacs bug
#8721. Advice added for `isearch-range-invisible' which calls
`notmuch-isearch-range-invisible' instead of the original
`isearch-range-invisible' when in `notmuch-show-mode'.
---
emacs/notmuch-wash.el | 67 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 67 insertions(+), 0 deletions(-)
diff --git a/emacs/notmuch-wash.el b/emacs/notmuch-wash.el
index 992fa8f..f37fd95 100644
--- a/emacs/notmuch-wash.el
+++ b/emacs/notmuch-wash.el
@@ -298,4 +298,71 @@ for error."
;;
+;; Temporary workaround for Emacs bug #8721
+;; http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8721
+
+(defun notmuch-isearch-range-invisible (beg end)
+ "Same as `isearch-range-invisible' but with fixed Emacs bug #8721."
+ (when (/= beg end)
+ ;; Check that invisibility runs up to END.
+ (save-excursion
+ (goto-char beg)
+ (let (;; can-be-opened keeps track if we can open some overlays.
+ (can-be-opened (eq search-invisible 'open))
+ ;; the list of overlays that could be opened
+ (crt-overlays nil))
+ (when (and can-be-opened isearch-hide-immediately)
+ (isearch-close-unnecessary-overlays beg end))
+ ;; If the following character is currently invisible,
+ ;; skip all characters with that same `invisible' property value.
+ ;; Do that over and over.
+ (while (and (< (point) end) (invisible-p (point)))
+ (if (get-text-property (point) 'invisible)
+ (progn
+ (goto-char (next-single-property-change (point) 'invisible
+ nil end))
+ ;; if text is hidden by an `invisible' text property
+ ;; we cannot open it at all.
+ (setq can-be-opened nil))
+ (when can-be-opened
+ (let ((overlays (overlays-at (point)))
+ ov-list
+ o
+ invis-prop)
+ (while overlays
+ (setq o (car overlays)
+ invis-prop (overlay-get o 'invisible))
+ (if (invisible-p invis-prop)
+ (if (overlay-get o 'isearch-open-invisible)
+ (setq ov-list (cons o ov-list))
+ ;; We found one overlay that cannot be
+ ;; opened, that means the whole chunk
+ ;; cannot be opened.
+ (setq can-be-opened nil)))
+ (setq overlays (cdr overlays)))
+ (if can-be-opened
+ ;; It makes sense to append to the open
+ ;; overlays list only if we know that this is
+ ;; t.
+ (setq crt-overlays (append ov-list crt-overlays)))))
+ (goto-char (next-overlay-change (point)))))
+ ;; See if invisibility reaches up thru END.
+ (if (>= (point) end)
+ (if (and can-be-opened (consp crt-overlays))
+ (progn
+ (setq isearch-opened-overlays
+ (append isearch-opened-overlays crt-overlays))
+ (mapc 'isearch-open-overlay-temporary crt-overlays)
+ nil)
+ (setq isearch-hidden t)))))))
+
+(defadvice isearch-range-invisible (around notmuch-isearch-range-invisible-advice activate)
+ "Call `notmuch-isearch-range-invisible' instead of the original
+`isearch-range-invisible' when in `notmuch-show-mode' mode."
+ (if (eq major-mode 'notmuch-show-mode)
+ (setq ad-return-value (notmuch-isearch-range-invisible beg end))
+ ad-do-it))
+
+;;
+
(provide 'notmuch-wash)
--
1.7.5.1
next prev parent reply other threads:[~2011-05-26 21:47 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-25 22:10 [PATCH] Fix hiding a message while some citations are visible Dmitry Kurochkin
2011-05-25 22:10 ` [PATCH 1/5] Pass message to the `notmuch-show-insert-text/plain-hook' hook Dmitry Kurochkin
2011-05-25 22:10 ` [PATCH 2/5] Set message invisibility spec properties before inserting the body Dmitry Kurochkin
2011-05-25 22:10 ` [PATCH 3/5] Fix hiding a message while some citations are shown in notmuch-show view Dmitry Kurochkin
2011-05-25 22:23 ` Carl Worth
2011-05-25 22:34 ` Dmitry Kurochkin
2011-05-25 22:46 ` Carl Worth
2011-05-25 23:10 ` Dmitry Kurochkin
2011-05-26 1:02 ` Carl Worth
2011-05-26 10:26 ` Dmitry Kurochkin
2011-05-26 21:31 ` Carl Worth
2011-05-26 21:42 ` Dmitry Kurochkin
2011-06-15 14:06 ` Carl Worth
2011-06-15 14:25 ` Dmitry Kurochkin
2011-06-15 16:16 ` Jameson Graef Rollins
2011-06-15 17:00 ` Carl Worth
2011-06-15 17:10 ` Dmitry Kurochkin
2011-05-25 22:10 ` [PATCH 4/5] Set higher priority for headers and hidden citation overlays Dmitry Kurochkin
2011-05-25 22:10 ` [PATCH 5/5] Simplify message and headers visibility code in notmuch-show view Dmitry Kurochkin
2011-05-26 21:38 ` [PATCH 1/2] test: add tests for hiding messages " Dmitry Kurochkin
2011-05-26 21:38 ` [PATCH 2/2] Workaround for Emacs bug #8721 Dmitry Kurochkin
2011-05-26 21:48 ` Dmitry Kurochkin [this message]
2011-05-28 1:29 ` Dmitry Kurochkin
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=874o4hp205.fsf@gmail.com \
--to=dmitry.kurochkin@gmail.com \
--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).