cp-grep, cp-git-grep: No longer rely counsel-prompt-function

The variable was just removed from counsel
This commit is contained in:
Eric Danan 2018-09-06 09:39:42 +02:00
parent 175b4a7874
commit 878f95c55d

View file

@ -677,7 +677,6 @@ called with a prefix argument."
(car (split-string counsel-projectile-grep-base-command))) (car (split-string counsel-projectile-grep-base-command)))
(setq counsel-projectile-grep-command (setq counsel-projectile-grep-command
(format counsel-projectile-grep-base-command ignored path)) (format counsel-projectile-grep-base-command ignored path))
(ivy-set-prompt 'counsel-projectile-grep counsel-prompt-function)
(ivy-read (projectile-prepend-project-name "grep") (ivy-read (projectile-prepend-project-name "grep")
#'counsel-projectile-grep-function #'counsel-projectile-grep-function
:initial-input counsel-projectile-grep-initial-input :initial-input counsel-projectile-grep-initial-input
@ -709,12 +708,7 @@ with a prefix argument."
" ")) " "))
(counsel-git-grep-cmd-default (counsel-git-grep-cmd-default
(concat (string-trim-right counsel-git-grep-cmd-default " \\.") (concat (string-trim-right counsel-git-grep-cmd-default " \\.")
" " path)) " " path)))
(counsel-prompt-function
(lambda ()
(ivy-add-prompt-count
(format "%s: " (projectile-prepend-project-name
(ivy-state-prompt ivy-last)))))))
(counsel-git-grep (or current-prefix-arg cmd) (counsel-git-grep (or current-prefix-arg cmd)
counsel-projectile-grep-initial-input))) counsel-projectile-grep-initial-input)))