diff options
| author | Glenn Morris | 2013-06-12 00:22:20 -0700 |
|---|---|---|
| committer | Glenn Morris | 2013-06-12 00:22:20 -0700 |
| commit | a7f3fecc54d229c14982c1f6ce225dda57ed1108 (patch) | |
| tree | ab3f464005717140973bcc70b0bb73667ac11b22 | |
| parent | 834b5ded7ab25adf61300161e57b6e11091db221 (diff) | |
| download | emacs-a7f3fecc54d229c14982c1f6ce225dda57ed1108.tar.gz emacs-a7f3fecc54d229c14982c1f6ce225dda57ed1108.zip | |
* lisp/ido.el (ido-delete-ignored-files): Rewrite to avoid cl-lib.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/ido.el | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a1a080ee9f7..4e9eb15b0e6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-06-12 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * ido.el (ido-delete-ignored-files): Rewrite to avoid cl-lib. | ||
| 4 | |||
| 1 | 2013-06-12 Eyal Lotem <eyal.lotem@gmail.com> (tiny change) | 5 | 2013-06-12 Eyal Lotem <eyal.lotem@gmail.com> (tiny change) |
| 2 | 6 | ||
| 3 | * ido.el (ido-delete-ignored-files): New function, | 7 | * 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." | |||
| 3273 | cur nil))) | 3273 | cur nil))) |
| 3274 | res)) | 3274 | res)) |
| 3275 | 3275 | ||
| 3276 | (require 'cl-lib) | ||
| 3277 | |||
| 3278 | (defun ido-delete-ignored-files (files) | 3276 | (defun ido-delete-ignored-files (files) |
| 3279 | (cl-delete-if | 3277 | "Delete elements from list FILES that match `ido-ignore-item-p'." |
| 3280 | (lambda (name) (ido-ignore-item-p name ido-ignore-files t)) | 3278 | (delq nil |
| 3281 | files)) | 3279 | (mapcar (lambda (name) |
| 3280 | (unless (ido-ignore-item-p name ido-ignore-files t) name)) | ||
| 3281 | files))) | ||
| 3282 | 3282 | ||
| 3283 | (defun ido-wide-find-dirs-or-files (dir file &optional prefix finddir) | 3283 | (defun ido-wide-find-dirs-or-files (dir file &optional prefix finddir) |
| 3284 | ;; As ido-run-find-command, but returns a list of cons pairs ("file" . "dir") | 3284 | ;; As ido-run-find-command, but returns a list of cons pairs ("file" . "dir") |