emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix #4386: interop between ivy-xref & dired-do-find-regexp

Browse source
This commit is contained in:
Henrik Lissner 2020-12-08 22:44:53 -05:00
parent 4652511440
commit fc9dd5748e
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/tools/lookup/config.el
View file

@ -170,7 +170,16 @@ Dictionary.app behind the scenes to get definitions.")
(setq xref-show-definitions-function #'ivy-xref-show-defs)) (setq xref-show-definitions-function #'ivy-xref-show-defs))
;; Necessary in Emacs <27. In Emacs 27 it will affect all xref-based ;; Necessary in Emacs <27. In Emacs 27 it will affect all xref-based
;; commands other than xref-find-definitions too (eg project-find-regexp) ;; commands other than xref-find-definitions too (eg project-find-regexp)
(setq xref-show-xrefs-function #'ivy-xref-show-xrefs)) (setq xref-show-xrefs-function #'ivy-xref-show-xrefs)
;; HACK Fix #4386: `ivy-xref-show-xrefs' calls `fetcher' twice, which has
;; side effects that breaks in some cases (i.e. on `dired-do-find-regexp').
(defadvice! +lookup--fix-ivy-xrefs (orig-fn fetcher alist)
:around #'ivy-xref-show-xrefs
(when (functionp fetcher)
(setf (alist-get 'fetched-xrefs alist)
(funcall fetcher)))
(funcall orig-fn fetcher alist)))
(use-package! helm-xref (use-package! helm-xref
:when (featurep! :completion helm))) :when (featurep! :completion helm)))