[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r116945: * lisp/dired-aux.el (dired-file-set-differe
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] trunk r116945: * lisp/dired-aux.el (dired-file-set-difference): Use lexical-scoping. |
Date: |
Sun, 06 Apr 2014 18:15:15 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116945
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sun 2014-04-06 14:15:09 -0400
message:
* lisp/dired-aux.el (dired-file-set-difference): Use lexical-scoping.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/dired-aux.el diredaux.el-20091113204419-o5vbwnq5f7feedwu-484
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-04-05 02:33:36 +0000
+++ b/lisp/ChangeLog 2014-04-06 18:15:09 +0000
@@ -1,7 +1,11 @@
+2014-04-06 Stefan Monnier <address@hidden>
+
+ * dired-aux.el (dired-file-set-difference): Use lexical-scoping.
+
2014-04-05 Leo Liu <address@hidden>
- * emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression): Add
- define-compilation-mode.
+ * emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression):
+ Add define-compilation-mode.
2014-04-04 João Távora <address@hidden>
=== modified file 'lisp/dired-aux.el'
--- a/lisp/dired-aux.el 2014-04-02 15:14:50 +0000
+++ b/lisp/dired-aux.el 2014-04-06 18:15:09 +0000
@@ -215,19 +215,24 @@
(dolist (file1 list1)
(unless (let ((list list2))
(while (and list
- (not (let* ((file2 (car list))
- (fa1 (car (cddr file1)))
- (fa2 (car (cddr file2)))
- (size1 (nth 7 fa1))
- (size2 (nth 7 fa2))
- (mtime1 (float-time (nth 5 fa1)))
- (mtime2 (float-time (nth 5 fa2))))
- (and
- (equal (car file1) (car file2))
- (not (eval predicate))))))
+ (let* ((file2 (car list))
+ (fa1 (car (cddr file1)))
+ (fa2 (car (cddr file2))))
+ (or
+ (not (equal (car file1) (car file2)))
+ (eval predicate
+ `((fa1 . ,fa1)
+ (fa2 . ,fa2)
+ (size1 . ,(nth 7 fa1))
+ (size2 . ,(nth 7 fa2))
+ (mtime1
+ . ,(float-time (nth 5 fa1)))
+ (mtime2
+ . ,(float-time (nth 5 fa2)))
+ )))))
(setq list (cdr list)))
list)
- (setq res (cons file1 res))))
+ (push file1 res)))
(nreverse res))))
(defun dired-files-attributes (dir)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r116945: * lisp/dired-aux.el (dired-file-set-difference): Use lexical-scoping.,
Stefan Monnier <=