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

completion/{helm,ivy}: fix stringp error

Browse source 
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).
This commit is contained in:
Henrik Lissner 2018-12-11 18:59:30 -05:00
parent a37d199862
commit a89a2aa70c
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/completion/helm/autoload/helm.el
View file

@ -122,7 +122,7 @@ order.
(declare (indent defun)) (declare (indent defun))
(require 'helm-ag) (require 'helm-ag)
(helm-ag--init-state) (helm-ag--init-state)
(let* ((project-root (doom-project-root)) (let* ((project-root (or (doom-project-root) default-directory))
(directory (or in project-root)) (directory (or in project-root))
(default-directory directory) (default-directory directory)
(helm-ag--default-directory directory) (helm-ag--default-directory directory)

5
modules/completion/ivy/autoload/ivy.el
View file

@ -218,7 +218,7 @@ order.
:recursive BOOL :recursive BOOL
Whether or not to search files recursively from the base directory." Whether or not to search files recursively from the base directory."
(declare (indent defun)) (declare (indent defun))
(let* ((project-root (doom-project-root)) (let* ((project-root (or (doom-project-root) default-directory))
(directory (or in project-root)) (directory (or in project-root))
(default-directory directory) (default-directory directory)
(engine (or engine (engine (or engine
@ -243,8 +243,7 @@ order.
"./") "./")
((equal directory project-root) ((equal directory project-root)
(projectile-project-name)) (projectile-project-name))
(t ((file-relative-name directory project-root))))))
(file-relative-name directory project-root))))))
(require 'counsel) (require 'counsel)
(let ((counsel-more-chars-alist (let ((counsel-more-chars-alist
(if query '((t . 1)) counsel-more-chars-alist))) (if query '((t . 1)) counsel-more-chars-alist)))