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

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

[elpa] master 0b26219 301/399: counsel.el (counsel--file-name-filter): M


From: Oleh Krehel
Subject: [elpa] master 0b26219 301/399: counsel.el (counsel--file-name-filter): Move ignore-re binding.
Date: Sat, 20 Jul 2019 14:57:44 -0400 (EDT)

branch: master
commit 0b2621975291d3bc764561255f6981ebf95ee0e6
Author: Brian Leung <address@hidden>
Commit: Brian Leung <address@hidden>

    counsel.el (counsel--file-name-filter): Move ignore-re binding.
    
    Closes #2094.
---
 counsel.el | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/counsel.el b/counsel.el
index 953b071..08e7868 100644
--- a/counsel.el
+++ b/counsel.el
@@ -1925,8 +1925,6 @@ one that exists will be used.")
 If USE-IGNORE is non-nil, try to generate a command that respects
 `counsel-find-file-ignore-regexp'."
   (let ((regex ivy--old-re)
-        (ignore-re (list (counsel--elisp-to-pcre
-                          counsel-find-file-ignore-regexp)))
         (filter-cmd (cl-find-if
                      (lambda (x)
                        (executable-find
@@ -1939,9 +1937,11 @@ If USE-IGNORE is non-nil, try to generate a command that 
respects
                (not (string-match-p "\\`\\." ivy-text))
                (not (string-match-p counsel-find-file-ignore-regexp
                                     (or (car ivy--old-cands) ""))))
-      (setq regex (if (stringp regex)
-                      (list ignore-re (cons regex t))
-                    (cons ignore-re regex))))
+      (let ((ignore-re (list (counsel--elisp-to-pcre
+                              counsel-find-file-ignore-regexp))))
+        (setq regex (if (stringp regex)
+                        (list ignore-re (cons regex t))
+                      (cons ignore-re regex)))))
     (setq cmd (format (car filter-cmd)
                       (counsel--elisp-to-pcre regex (cdr filter-cmd))))
     (if (string-match-p "csh\\'" shell-file-name)



reply via email to

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