* lisp/ido.el (ido-delete-ignored-files): Remove.

(ido-wide-find-dirs-or-files, ido-make-file-list-1):
Go back to calling ido-ignore-item-p directly.

Doesn't seem worth looping over files twice in ido-make-file-list-1.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 62b158179ea301e3518a4b68e2faf976e3945fb3..ae429db7a7a2eb71307266f0ab44fd135011f527 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,8 @@
 2013-06-12  Glenn Morris  <rgm@gnu.org>
 
-       * ido.el (ido-delete-ignored-files): Rewrite to avoid cl-lib.
+       * ido.el (ido-delete-ignored-files): Remove.
+       (ido-wide-find-dirs-or-files, ido-make-file-list-1):
+       Go back to calling ido-ignore-item-p directly.
 
 2013-06-12  Eyal Lotem  <eyal.lotem@gmail.com>  (tiny change)
 

diff --git a/lisp/ido.el b/lisp/ido.el
index b73094f2db3ff3b26c6a2d577b590af02b2c91f9..14d1be5b763cfffc3e4163ce55bf397185207d6c 100644 (file)
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -3273,25 +3273,21 @@ for first matching file."
              cur nil)))
     res))
 
-(defun ido-delete-ignored-files (files)
-  "Delete elements from list FILES that match `ido-ignore-item-p'."
-  (delq nil
-        (mapcar (lambda (name)
-                  (unless (ido-ignore-item-p name ido-ignore-files t) name))
-                files)))
-
 (defun ido-wide-find-dirs-or-files (dir file &optional prefix finddir)
   ;; As ido-run-find-command, but returns a list of cons pairs ("file" . "dir")
   (let ((filenames
-         (ido-delete-ignored-files
-          (split-string
-           (shell-command-to-string
-            (concat "find "
-                    (shell-quote-argument dir)
-                    (if ido-case-fold " -iname " " -name ")
-                    (shell-quote-argument
-                     (concat (if prefix "" "*") file "*"))
-                    " -type " (if finddir "d" "f") " -print")))))
+         (delq nil
+               (mapcar (lambda (name)
+                         (unless (ido-ignore-item-p name ido-ignore-files t)
+                           name))
+                       (split-string
+                        (shell-command-to-string
+                         (concat "find "
+                                 (shell-quote-argument dir)
+                                 (if ido-case-fold " -iname " " -name ")
+                                 (shell-quote-argument
+                                  (concat (if prefix "" "*") file "*"))
+                                 " -type " (if finddir "d" "f") " -print"))))))
        filename d f
        res)
     (while filenames
@@ -3586,10 +3582,12 @@ This is to make them appear as if they were \"virtual buffers\"."
   ;; If MERGED is non-nil, each file is cons'ed with DIR
   (and (or (ido-is-tramp-root dir) (ido-is-unc-root dir)
           (file-directory-p dir))
-       (mapcar
-       (lambda (name) (if merged (cons name dir) name))
-       (ido-delete-ignored-files
-        (ido-file-name-all-completions dir)))))
+       (delq nil
+            (mapcar
+             (lambda (name)
+               (if (not (ido-ignore-item-p name ido-ignore-files t))
+                   (if merged (cons name dir) name)))
+             (ido-file-name-all-completions dir)))))
 
 (defun ido-make-file-list (default)
   ;; Return the current list of files.