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

Restore projectile-project-root's old behavior

Browse source 
For now...
This commit is contained in:
Henrik Lissner 2018-09-27 20:59:17 -04:00
parent d5f8ecdfce
commit 4bdd6002a4
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/autoload/projects.el
View file

@ -61,10 +61,7 @@ If NOCACHE, don't fetch a cached answer."
(if nocache
(without-project-cache! (doom-project-root nil))
(let (projectile-require-project-root)
;; NOTE `projectile-project-root' should return default-directory if we're
;; not in a project. Seems to be a bug upstream.
(or (projectile-project-root)
default-directory))))
(projectile-project-root))))
;;;###autoload
(defalias 'doom-project-expand #'projectile-expand-root)

9
core/core-projects.el
View file

@ -45,6 +45,15 @@
projectile-project-root-files)
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
;; connections, so disable them.
(defun doom*projectile-locate-dominating-file (orig-fn file name)