From 2cd1c43217e82fb04a5e5c6052c49d4b263f0cb4 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 17 Aug 2019 15:58:36 -0400 Subject: [PATCH] Suppress errors in +ivy--set-jump-point-maybe-h --- modules/completion/ivy/config.el | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/completion/ivy/config.el b/modules/completion/ivy/config.el index b84052eee..fa7b46653 100644 --- a/modules/completion/ivy/config.el +++ b/modules/completion/ivy/config.el @@ -109,11 +109,13 @@ immediately runs it on the current candidate (ending the ivy session)." (add-hook! 'minibuffer-exit-hook (defun +ivy--set-jump-point-maybe-h () - (when (and (markerp +ivy--origin) - (not (equal (with-ivy-window (point-marker)) +ivy--origin))) - (with-current-buffer (marker-buffer +ivy--origin) - (better-jumper-set-jump +ivy--origin))) - (setq +ivy--origin nil))) + (with-demoted-errors "Ivy error: %s" + (when (and (markerp +ivy--origin) + (not (equal (with-ivy-window (point-marker)) + +ivy--origin))) + (with-current-buffer (marker-buffer +ivy--origin) + (better-jumper-set-jump +ivy--origin))) + (setq +ivy--origin nil)))) (after! yasnippet (add-to-list 'yas-prompt-functions #'+ivy-yas-prompt nil #'eq))