From 052cee93dbbd5dfa5975e61ec3ca954e0ece0eae Mon Sep 17 00:00:00 2001 From: Amos Bird Date: Thu, 4 Jan 2018 15:49:18 +0800 Subject: [PATCH] fix ivy. Due to this commit https://github.com/abo-abo/swiper/commit/4f57b5a9eb3f9c971d48fb33dca54af43bd497ca --- 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 8a008348d..005271855 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-dir) + (let ((default-directory (ivy-state-directory ivy-last)) (regex (counsel-unquote-regex-parens (setq ivy--old-re (ivy--regex string))))) @@ -200,7 +200,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-dir)) + (find-file-other-window (expand-file-name file-name (ivy-state-directory ivy-last))) (goto-char (point-min)) (forward-line (1- (string-to-number line-number))) (re-search-forward (ivy--regex ivy-text t) (line-end-position) t)