Commit 001809f6 authored by Glenn Morris's avatar Glenn Morris
Browse files

* 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.
parent 08c73ed2
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)
 
......@@ -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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment