* lisp/ido.el (ido-delete-ignored-files): Rewrite to avoid cl-lib.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a1a080ee9f76394e31ae00d07e07a85d0473be89..4e9eb15b0e6c659cd9980a6494ddd6881fa16e95 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-12  Glenn Morris  <rgm@gnu.org>
+
+       * ido.el (ido-delete-ignored-files): Rewrite to avoid cl-lib.
+
 2013-06-12  Eyal Lotem  <eyal.lotem@gmail.com>  (tiny change)
 
        * ido.el (ido-delete-ignored-files): New function,

diff --git a/lisp/ido.el b/lisp/ido.el
index 1b7d4e78cb734326a678ed8439857d67e306fd82..56331661f241aa30ccb4fcb4d6da06df72138ede 100644 (file)
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -3273,12 +3273,12 @@ for first matching file."
              cur nil)))
     res))
 
-(require 'cl-lib)
-
 (defun ido-delete-ignored-files (files)
-  (cl-delete-if
-   (lambda (name) (ido-ignore-item-p name ido-ignore-files t))
-   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")