From 1684e6af02c3dfcbe2dc27732a5787655d869d40 Mon Sep 17 00:00:00 2001 From: Oleh Krehel Date: Tue, 5 May 2015 17:39:41 +0200 Subject: [PATCH] Avoid image-mode and doc-view-mode * avy-jump.el (avy--regex-candidates): Update. Re #1 --- avy-jump.el | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/avy-jump.el b/avy-jump.el index c76e266..5ad0ecd 100644 --- a/avy-jump.el +++ b/avy-jump.el @@ -129,16 +129,17 @@ When PRED is non-nil, it's a filter for matching point positions." (window-list) (list (selected-window)))) (with-selected-window wnd - (let ((we (or end (window-end (selected-window) t)))) - (save-excursion - (goto-char (or beg (window-start))) - (while (re-search-forward regex we t) - (unless (get-char-property (point) 'invisible) - (when (or (null pred) - (funcall pred)) - (push (cons (cons (match-beginning 0) - (match-end 0)) - wnd) candidates)))))))) + (unless (memq major-mode '(image-mode doc-view-mode)) + (let ((we (or end (window-end (selected-window) t)))) + (save-excursion + (goto-char (or beg (window-start))) + (while (re-search-forward regex we t) + (unless (get-char-property (point) 'invisible) + (when (or (null pred) + (funcall pred)) + (push (cons (cons (match-beginning 0) + (match-end 0)) + wnd) candidates))))))))) (nreverse candidates))) (defvar avy--overlay-offset 0