From a89a2aa70c267d3fbf1be967621913543ab8a078 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 11 Dec 2018 18:59:30 -0500 Subject: [PATCH] completion/{helm,ivy}: fix stringp error Cause by the expectation that doom-project-root would never return nil (which was changed to return nil if not in a valid project, due to an update upstream, in projectile). --- modules/completion/helm/autoload/helm.el | 2 +- modules/completion/ivy/autoload/ivy.el | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/completion/helm/autoload/helm.el b/modules/completion/helm/autoload/helm.el index 44c92f4ee..e7d6376f5 100644 --- a/modules/completion/helm/autoload/helm.el +++ b/modules/completion/helm/autoload/helm.el @@ -122,7 +122,7 @@ order. (declare (indent defun)) (require 'helm-ag) (helm-ag--init-state) - (let* ((project-root (doom-project-root)) + (let* ((project-root (or (doom-project-root) default-directory)) (directory (or in project-root)) (default-directory directory) (helm-ag--default-directory directory) diff --git a/modules/completion/ivy/autoload/ivy.el b/modules/completion/ivy/autoload/ivy.el index e94be5b29..2b97608ed 100644 --- a/modules/completion/ivy/autoload/ivy.el +++ b/modules/completion/ivy/autoload/ivy.el @@ -218,7 +218,7 @@ order. :recursive BOOL Whether or not to search files recursively from the base directory." (declare (indent defun)) - (let* ((project-root (doom-project-root)) + (let* ((project-root (or (doom-project-root) default-directory)) (directory (or in project-root)) (default-directory directory) (engine (or engine @@ -243,8 +243,7 @@ order. "./") ((equal directory project-root) (projectile-project-name)) - (t - (file-relative-name directory project-root)))))) + ((file-relative-name directory project-root)))))) (require 'counsel) (let ((counsel-more-chars-alist (if query '((t . 1)) counsel-more-chars-alist)))