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

selectrum: remove doom-project-find-file hack

Browse source 
This solution doesn't rely on condition evaluation order, and doesn't
contain `featurep!`'s unnecessarily.
This commit is contained in:
Itai Y. Efrat 2021-07-02 23:32:01 +03:00
parent e65dffd790
commit 92586cacd4
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/autoload/projects.el
View file

@ -128,13 +128,13 @@ If DIR is not a project, it will be indexed (but not cached)."
(if (doom-module-p :completion 'ivy) (if (doom-module-p :completion 'ivy)
#'counsel-projectile-find-file #'counsel-projectile-find-file
#'projectile-find-file))) #'projectile-find-file)))
((fboundp 'selectrum-mode) ;HACK see @ymarco's comment on #5013 and TODO.org in the selecturm module. ((and (bound-and-true-p ivy-mode)
(call-interactively #'find-file)) (fboundp 'counsel-file-jump))
((fboundp 'counsel-file-jump) ; ivy only
(call-interactively #'counsel-file-jump)) (call-interactively #'counsel-file-jump))
((project-current nil dir) ((project-current nil dir)
(project-find-file-in nil nil dir)) (project-find-file-in nil nil dir))
((fboundp 'helm-find-files) ((and (bound-and-true-p helm-mode)
(fboundp 'helm-find-files))
(call-interactively #'helm-find-files)) (call-interactively #'helm-find-files))
((call-interactively #'find-file))))) ((call-interactively #'find-file)))))

2
modules/completion/selectrum/TODO.org
View file

@ -97,7 +97,7 @@ This might be a temporary concern, but still.
** TODO ~fboundp~ issues ** TODO ~fboundp~ issues
Even if the =ivy= module isn't loaded, it's packages can still get loaded by Even if the =ivy= module isn't loaded, it's packages can still get loaded by
other means, such as =lispy= requiring =counsel=. This means that the ~fboundp~ other means, such as =lispy= requiring =counsel=. This means that the ~fboundp~
logic such [[file:~/.emacs.d/modules/config/default/autoload/text.el::(cond ((fboundp 'consult-yank-pop) #'consult-yank-pop) ;;HACK see @ymarco's comment on #5013 and TODO.org][here]] and [[file:~/.emacs.d/core/autoload/projects.el::((fboundp 'selectrum-mode) ;HACK see @ymarco's comment on #5013 and TODO.org][here]] won't work unless the selectrum option is checked logic [[file:~/.emacs.d/modules/config/default/autoload/text.el::(cond ((fboundp 'consult-yank-pop) #'consult-yank-pop) ;;HACK see @ymarco's comment on #5013 and TODO.org][here]] (and formerly [[file:~/.emacs.d/core/autoload/projects.el::(and (bound-and-true-p ivy-mode][here]]) won't work unless the selectrum option is checked
first, which is what we do for now. first, which is what we do for now.
** TODO ~projectile-switch-project-action~ definition ** TODO ~projectile-switch-project-action~ definition
Without [[file:~/.emacs.d/modules/ui/workspaces/config.el::;; HACK?? needs review][this]] change new projects don't get opened in a new tab, but the exact Without [[file:~/.emacs.d/modules/ui/workspaces/config.el::;; HACK?? needs review][this]] change new projects don't get opened in a new tab, but the exact