emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/ivy-hydra b0029ca 010/395: Make casefold settings for c


From: Basil L. Contovounesios
Subject: [elpa] externals/ivy-hydra b0029ca 010/395: Make casefold settings for counsel-git-grep work.
Date: Thu, 25 Feb 2021 08:31:20 -0500 (EST)

branch: externals/ivy-hydra
commit b0029ca793f745fe3ceba02ea7ade45db476d490
Author: Hong Xu <hong@topbug.net>
Commit: Oleh Krehel <ohwoeowho@gmail.com>

    Make casefold settings for counsel-git-grep work.
    
    * counsel.el (counsel-git-grep-cmd-default)
    (counsel-git-grep-function, counsel-git-grep-proj-function): Make casefold 
settings in
    `counsel-git-grep' work.
    
    Fixes #2287
---
 counsel.el | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/counsel.el b/counsel.el
index e263ad8..9966acb 100644
--- a/counsel.el
+++ b/counsel.el
@@ -1316,7 +1316,7 @@ INITIAL-INPUT can be given as the initial minibuffer 
input."
     (define-key map (kbd "C-x C-d") 'counsel-cd)
     map))
 
-(defvar counsel-git-grep-cmd-default "git --no-pager grep -n --no-color -i -I 
-e \"%s\""
+(defvar counsel-git-grep-cmd-default "git --no-pager grep -n --no-color -I -e 
\"%s\""
   "Initial command for `counsel-git-grep'.")
 
 (defvar counsel-git-grep-cmd nil
@@ -1362,7 +1362,9 @@ Typical value: '(recenter)."
    (ivy-more-chars)
    (progn
      (counsel--async-command
-      (funcall counsel-git-grep-cmd-function string))
+      (concat
+       (funcall counsel-git-grep-cmd-function string)
+       (if (ivy--case-fold-p string) " -i" "")))
      nil)))
 
 (defun counsel-git-grep-action (x)
@@ -1511,7 +1513,10 @@ When CMD is non-nil, prompt for a specific \"git grep\" 
command."
    (ivy-more-chars)
    (let ((regex (setq ivy--old-re
                       (ivy--regex str t))))
-     (counsel--async-command (format counsel-git-grep-cmd regex))
+     (counsel--async-command
+      (concat
+       (format counsel-git-grep-cmd regex)
+       (if (ivy--case-fold-p str) " -i" "")))
      nil)))
 
 (defun counsel-git-grep-switch-cmd ()



reply via email to

[Prev in Thread] Current Thread [Next in Thread]