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

ivy: fix void-variable counsel--git-grep-dir

Browse source 
Upstream updates replaced counsel--git-grep-dir with counsel--git-dir.
This broke a couple project-search utilities in doom.
This commit is contained in:
Henrik Lissner 2017-09-08 16:58:01 +02:00
parent 082a580c1e
commit 55b9788351
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -141,7 +141,7 @@ counsel-rg)."
(setq extra-ag-args "")) (setq extra-ag-args ""))
(if (< (length string) 1) ;; #1 (if (< (length string) 1) ;; #1
(counsel-more-chars 1) (counsel-more-chars 1)
(let ((default-directory counsel--git-grep-dir) (let ((default-directory counsel--git-dir)
(regex (counsel-unquote-regex-parens (regex (counsel-unquote-regex-parens
(setq ivy--old-re (setq ivy--old-re
(ivy--regex (ivy--regex
@ -201,7 +201,7 @@ counsel-rg)."
(with-ivy-window (with-ivy-window
(let ((file-name (match-string-no-properties 1 x)) (let ((file-name (match-string-no-properties 1 x))
(line-number (match-string-no-properties 2 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)) (goto-char (point-min))
(forward-line (1- (string-to-number line-number))) (forward-line (1- (string-to-number line-number)))
(re-search-forward (ivy--regex ivy-text t) (line-end-position) t) (re-search-forward (ivy--regex ivy-text t) (line-end-position) t)