Restore projectile-project-root's old behavior
For now...
This commit is contained in:
parent
d5f8ecdfce
commit
4bdd6002a4
2 changed files with 10 additions and 4 deletions
|
@ -61,10 +61,7 @@ If NOCACHE, don't fetch a cached answer."
|
||||||
(if nocache
|
(if nocache
|
||||||
(without-project-cache! (doom-project-root nil))
|
(without-project-cache! (doom-project-root nil))
|
||||||
(let (projectile-require-project-root)
|
(let (projectile-require-project-root)
|
||||||
;; NOTE `projectile-project-root' should return default-directory if we're
|
(projectile-project-root))))
|
||||||
;; not in a project. Seems to be a bug upstream.
|
|
||||||
(or (projectile-project-root)
|
|
||||||
default-directory))))
|
|
||||||
|
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
(defalias 'doom-project-expand #'projectile-expand-root)
|
(defalias 'doom-project-expand #'projectile-expand-root)
|
||||||
|
|
|
@ -45,6 +45,15 @@
|
||||||
projectile-project-root-files)
|
projectile-project-root-files)
|
||||||
projectile-project-root-files-bottom-up nil)))
|
projectile-project-root-files-bottom-up nil)))
|
||||||
|
|
||||||
|
;; Restores the old behavior of `projectile-project-root', where it returns
|
||||||
|
;; `default-directory' if not in a project, at least until I update Doom to
|
||||||
|
;; deal with this.
|
||||||
|
;; FIXME Check again after https://github.com/bbatsov/projectile/issues/1296
|
||||||
|
(defun doom*projectile-project-root (project-root)
|
||||||
|
(or project-root
|
||||||
|
default-directory))
|
||||||
|
(advice-add #'projectile-project-root :filter-return #'doom*projectile-project-root)
|
||||||
|
|
||||||
;; Projectile root-searching functions can cause an infinite loop on TRAMP
|
;; Projectile root-searching functions can cause an infinite loop on TRAMP
|
||||||
;; connections, so disable them.
|
;; connections, so disable them.
|
||||||
(defun doom*projectile-locate-dominating-file (orig-fn file name)
|
(defun doom*projectile-locate-dominating-file (orig-fn file name)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue