branch: elpa/aidermacs commit 7e2ec84aee9b7003eea1e0098a07619c1cbe5206 Author: Mike Olson <mwol...@member.fsf.org> Commit: Mike Olson <mwol...@member.fsf.org>
Check for non-nil `(project-current)` before calling `(project-root)` --- aidermacs.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aidermacs.el b/aidermacs.el index 8910c7b1c4..138acd4d38 100644 --- a/aidermacs.el +++ b/aidermacs.el @@ -65,7 +65,7 @@ When nil, disable auto-commits requiring manual git commits." (defun aidermacs-project-root () "Get the project root using project.el, VC, or fallback to file directory." - (or (when (fboundp 'project-current) + (or (when (and (fboundp 'project-current) (project-current)) (project-root (project-current))) (vc-git-root default-directory) (when buffer-file-name