From: Glenn Morris <rgm@gnu.org>
Date: Wed, 12 Jun 2013 07:22:20 +0000 (-0700)
Subject: * lisp/ido.el (ido-delete-ignored-files): Rewrite to avoid cl-lib.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2016^2~145^2~7
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a7f3fecc54d229c14982c1f6ce225dda57ed1108;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a1a080ee9f7..4e9eb15b0e6 100644
--- 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 1b7d4e78cb7..56331661f24 100644
--- 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")