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

Merge branch 'hotfix-counsel'

Browse source 
* hotfix-counsel:
  ivy: fix void-variable counsel--git-grep-dir
This commit is contained in:
Henrik Lissner 2017-09-08 17:00:19 +02:00
commit 14018775a3
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 ""))
(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)