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

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

[elpa] master 88169a3 147/272: "C-x C-f" can un-ignore dotfiles with a l


From: Oleh Krehel
Subject: [elpa] master 88169a3 147/272: "C-x C-f" can un-ignore dotfiles with a leading dot input
Date: Mon, 25 Apr 2016 10:13:22 +0000

branch: master
commit 88169a3647a395712a0a79a3952249bd010551e5
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>

    "C-x C-f" can un-ignore dotfiles with a leading dot input
    
    * counsel.el (counsel-find-file-ignore-regexp): Add a recommended value,
    all dotfiles.
    (counsel--find-file-matcher): When `ivy-text' starts with a dot, don't
    use `counsel-find-file-ignore-regexp'. The generic way to do this is
    with "C-c C-a" (`ivy-toggle-ignore'), but this is faster and more 
convenient.
    
    Re #408
---
 counsel.el |   20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/counsel.el b/counsel.el
index dfe6d94..46300e9 100644
--- a/counsel.el
+++ b/counsel.el
@@ -1001,12 +1001,20 @@ done") "\n" t)))
 
 (defcustom counsel-find-file-ignore-regexp nil
   "A regexp of files to ignore while in `counsel-find-file'.
-These files are un-ignored if `ivy-text' matches them.
-The common way to show all files is to start `ivy-text' with a dot.
-Possible value: \"\\(?:\\`[#.]\\)\\|\\(?:[#~]\\'\\)\"."
+These files are un-ignored if `ivy-text' matches them.  The
+common way to show all files is to start `ivy-text' with a dot.
+
+Example value: \"\\(?:\\`[#.]\\)\\|\\(?:[#~]\\'\\)\". This will hide
+temporary and lock files.
+\\<ivy-minibuffer-map>
+Choosing the dotfiles option, \"\\`\\.\", might be convenient,
+since you can still access the dotfiles if your input starts with
+a dot. The generic way to toggle ignored files is \\[ivy-toggle-ignore],
+but the leading dot is a lot faster."
   :group 'ivy
   :type '(choice
           (const :tag "None" nil)
+          (const :tag "Dotfiles" "\\`\\.")
           (regexp :tag "Regex")))
 
 (defun counsel--find-file-matcher (regexp candidates)
@@ -1015,11 +1023,13 @@ Skip some dotfiles unless `ivy-text' requires them."
   (let ((res (ivy--re-filter regexp candidates)))
     (if (or (null ivy-use-ignore)
             (null counsel-find-file-ignore-regexp)
-            (string-match counsel-find-file-ignore-regexp ivy-text))
+            (string-match "\\`\\." ivy-text))
         res
       (or (cl-remove-if
            (lambda (x)
-             (string-match counsel-find-file-ignore-regexp x))
+             (and
+              (string-match counsel-find-file-ignore-regexp x)
+              (not (member x ivy-extra-directories))))
            res)
           res))))
 



reply via email to

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