maciej/counsel-projectile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cp-{grep,git-grep,ag,rg}: Fix error when customizing initial-input

Browse source 
Fixes #125.
This commit is contained in:
Eric Danan 2019-03-25 09:51:27 +01:00
parent e9d3344f84
commit a07ddc808b
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
counsel-projectile.el
View file

@ -620,9 +620,9 @@ Note that you can always insert the value
of `(ivy-thing-at-point)' by hitting \"M-n\" in the minibuffer." of `(ivy-thing-at-point)' by hitting \"M-n\" in the minibuffer."
:type '(choice :type '(choice
(const :tag "None" nil) (const :tag "None" nil)
(const :tag "Symbol at point (generic)" '(thing-at-point 'symbol t)) (const :tag "Symbol at point (generic)" (thing-at-point 'symbol t))
(const :tag "Symbol or selection at point (projectile)" '(projectile-symbol-or-selection-at-point)) (const :tag "Symbol or selection at point (projectile)" (projectile-symbol-or-selection-at-point))
(const :tag "Thing at point (ivy)" '(ivy-thing-at-point)) (const :tag "Thing at point (ivy)" (ivy-thing-at-point))
(sexp :tag "Custom expression")) (sexp :tag "Custom expression"))
:group 'counsel-projectile) :group 'counsel-projectile)
@ -726,7 +726,7 @@ called with a prefix argument."
(format counsel-projectile-grep-base-command ignored path)) (format counsel-projectile-grep-base-command ignored path))
(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 (eval counsel-projectile-grep-initial-input)
:dynamic-collection t :dynamic-collection t
:keymap counsel-ag-map :keymap counsel-ag-map
:history 'counsel-git-grep-history :history 'counsel-git-grep-history
@ -765,7 +765,7 @@ with a prefix argument."
'counsel-git-grep 'counsel-git-grep
counsel-projectile-git-grep-extra-actions) counsel-projectile-git-grep-extra-actions)
(counsel-git-grep (or current-prefix-arg cmd) (counsel-git-grep (or current-prefix-arg cmd)
counsel-projectile-grep-initial-input)))) (eval counsel-projectile-grep-initial-input)))))
;;* counsel-projectile-ag ;;* counsel-projectile-ag
@ -778,9 +778,9 @@ Note that you can always insert the value
of `(ivy-thing-at-point)' by hitting \"M-n\" in the minibuffer." of `(ivy-thing-at-point)' by hitting \"M-n\" in the minibuffer."
:type '(choice :type '(choice
(const :tag "None" nil) (const :tag "None" nil)
(const :tag "Symbol at point (generic)" '(thing-at-point 'symbol t)) (const :tag "Symbol at point (generic)" (thing-at-point 'symbol t))
(const :tag "Symbol or selection at point (projectile)" '(projectile-symbol-or-selection-at-point)) (const :tag "Symbol or selection at point (projectile)" (projectile-symbol-or-selection-at-point))
(const :tag "Thing at point (ivy)" '(ivy-thing-at-point)) (const :tag "Thing at point (ivy)" (ivy-thing-at-point))
(sexp :tag "Custom expression")) (sexp :tag "Custom expression"))
:group 'counsel-projectile) :group 'counsel-projectile)
@ -848,9 +848,9 @@ Note that you can always insert the value
of `(ivy-thing-at-point)' by hitting \"M-n\" in the minibuffer." of `(ivy-thing-at-point)' by hitting \"M-n\" in the minibuffer."
:type '(choice :type '(choice
(const :tag "None" nil) (const :tag "None" nil)
(const :tag "Symbol at point (generic)" '(thing-at-point 'symbol t)) (const :tag "Symbol at point (generic)" (thing-at-point 'symbol t))
(const :tag "Symbol or selection at point (projectile)" '(projectile-symbol-or-selection-at-point)) (const :tag "Symbol or selection at point (projectile)" (projectile-symbol-or-selection-at-point))
(const :tag "Thing at point (ivy)" '(ivy-thing-at-point)) (const :tag "Thing at point (ivy)" (ivy-thing-at-point))
(sexp :tag "Custom expression")) (sexp :tag "Custom expression"))
:group 'counsel-projectile) :group 'counsel-projectile)