From d7de9118e8c4c57549c33a46e21aec8db286732d Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 17 Apr 2021 23:25:35 -0400 Subject: [PATCH] Fix #4882: ffap lookup handler triggers twice Also, fall back to counsel-file-jump before ffap. --- modules/tools/lookup/autoload/lookup.el | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/tools/lookup/autoload/lookup.el b/modules/tools/lookup/autoload/lookup.el index 5b24c5ffd..98c520f65 100644 --- a/modules/tools/lookup/autoload/lookup.el +++ b/modules/tools/lookup/autoload/lookup.el @@ -262,7 +262,8 @@ current buffer." "Uses `find-file-at-point' to read file at point." (require 'ffap) (when (ffap-guesser) - (find-file-at-point))) + (find-file-at-point) + t)) (defun +lookup-bug-reference-backend-fn (_identifier) "Searches for a bug reference in user/repo#123 or #123 format and opens it in @@ -369,7 +370,11 @@ Otherwise, falls back on `find-file-at-point'." ((stringp path) (find-file-at-point path)) - ((call-interactively #'find-file-at-point)))) + ((featurep! :completion ivy) + (counsel-file-jump (thing-at-point 'filename t) + (doom-project-root))) + + ((ffap-prompter (thing-at-point 'filename t))))) ;;