From 55b9788351591de0ffadf41c634339a44d043e04 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 8 Sep 2017 16:58:01 +0200 Subject: [PATCH] ivy: fix void-variable counsel--git-grep-dir Upstream updates replaced counsel--git-grep-dir with counsel--git-dir. This broke a couple project-search utilities in doom. --- modules/completion/ivy/autoload/ivy.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/completion/ivy/autoload/ivy.el b/modules/completion/ivy/autoload/ivy.el index b6c621631..277d140ff 100644 --- a/modules/completion/ivy/autoload/ivy.el +++ b/modules/completion/ivy/autoload/ivy.el @@ -141,7 +141,7 @@ counsel-rg)." (setq extra-ag-args "")) (if (< (length string) 1) ;; #1 (counsel-more-chars 1) - (let ((default-directory counsel--git-grep-dir) + (let ((default-directory counsel--git-dir) (regex (counsel-unquote-regex-parens (setq ivy--old-re (ivy--regex @@ -201,7 +201,7 @@ counsel-rg)." (with-ivy-window (let ((file-name (match-string-no-properties 1 x)) (line-number (match-string-no-properties 2 x))) - (find-file-other-window (expand-file-name file-name counsel--git-grep-dir)) + (find-file-other-window (expand-file-name file-name counsel--git-dir)) (goto-char (point-min)) (forward-line (1- (string-to-number line-number))) (re-search-forward (ivy--regex ivy-text t) (line-end-position) t)