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

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

[elpa] externals/ivy-hydra 80101ca 383/395: counsel.el (counsel-ag-funct


From: Basil L. Contovounesios
Subject: [elpa] externals/ivy-hydra 80101ca 383/395: counsel.el (counsel-ag-function): User switches override -i/-s
Date: Thu, 25 Feb 2021 08:32:43 -0500 (EST)

branch: externals/ivy-hydra
commit 80101ca9c855ae2241e2e15130caa951b8416f70
Author: Aaron L. Zeng <me@bcc32.com>
Commit: Basil L. Contovounesios <contovob@tcd.ie>

    counsel.el (counsel-ag-function): User switches override -i/-s
    
    Copyright-paperwork-exempt: yes
    
    Closes #2793.
---
 counsel.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/counsel.el b/counsel.el
index af0ac61..f702ab5 100644
--- a/counsel.el
+++ b/counsel.el
@@ -2991,11 +2991,11 @@ NEEDLE is the search string."
        (ivy-more-chars))
      (let* ((default-directory (ivy-state-directory ivy-last))
             (regex (counsel--grep-regex search-term))
-            (switches (concat (car command-args)
-                              (counsel--ag-extra-switches regex)
-                              (if (ivy--case-fold-p string)
+            (switches (concat (if (ivy--case-fold-p string)
                                   " -i "
-                                " -s "))))
+                                " -s ")
+                              (counsel--ag-extra-switches regex)
+                              (car command-args))))
        (counsel--async-command (counsel--format-ag-command
                                 switches
                                 (funcall (if (listp counsel-ag-command) 
#'identity



reply via email to

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