[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111189: Prune erroneous values in
From: |
Leo Liu |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111189: Prune erroneous values in dired-get-marked-files |
Date: |
Sat, 19 Jan 2013 02:35:44 +0800 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 111189
fixes bug: http://debbugs.gnu.org/13152
committer: Leo Liu <address@hidden>
branch nick: emacs-24
timestamp: Sat 2013-01-19 02:35:44 +0800
message:
Prune erroneous values in dired-get-marked-files
modified:
lisp/ChangeLog
lisp/dired.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-01-17 02:07:25 +0000
+++ b/lisp/ChangeLog 2013-01-18 18:35:44 +0000
@@ -1,3 +1,8 @@
+2013-01-18 Leo Liu <address@hidden>
+
+ * dired.el (dired-get-marked-files): Prune erroneous values due to
+ last change. (Bug#13152)
+
2013-01-17 Glenn Morris <address@hidden>
* progmodes/etags.el (tags-table-check-computed-list):
=== modified file 'lisp/dired.el'
--- a/lisp/dired.el 2013-01-01 12:22:35 +0000
+++ b/lisp/dired.el 2013-01-18 18:35:44 +0000
@@ -620,12 +620,14 @@
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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-24 r111189: Prune erroneous values in dired-get-marked-files,
Leo Liu <=