Prune erroneous values in dired-get-marked-files

Fixes: debbugs:13152
This commit is contained in:
Leo Liu 2013-01-19 02:35:44 +08:00
parent e17b97778d
commit 2fc71e3c45
2 changed files with 13 additions and 6 deletions

View file

@ -1,3 +1,8 @@
2013-01-18 Leo Liu <sdl.web@gmail.com>
* dired.el (dired-get-marked-files): Prune erroneous values due to
last change. (Bug#13152)
2013-01-17 Glenn Morris <rgm@gnu.org>
* progmodes/etags.el (tags-table-check-computed-list):

View file

@ -620,12 +620,14 @@ Optional third argument FILTER, if non-nil, is a function to select
If DISTINGUISH-ONE-MARKED is non-nil, then if we find just one marked file,
return (t FILENAME) instead of (FILENAME).
Don't use that together with FILTER."
(let* ((all-of-them
(save-excursion
(dired-map-over-marks
(dired-get-filename localp 'no-error-if-not-filep)
arg nil distinguish-one-marked)))
result)
(let ((all-of-them
(save-excursion
(delq nil (dired-map-over-marks
(dired-get-filename localp 'no-error-if-not-filep)
arg nil distinguish-one-marked))))
result)
(when (equal all-of-them '(t))
(setq all-of-them nil))
(if (not filter)
(if (and distinguish-one-marked (eq (car all-of-them) t))
all-of-them