X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/1e757eb0a5bab2bdd26de8a6553ee5c2b2e2a381..16e80fc942632c5f8989c98185e1a8fe38552981:/lisp/dired-aux.el?ds=sidebyside

diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index b59b7cecc3..bb93cce650 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -215,19 +215,24 @@ condition.  Two file items are considered to match if they are equal
       (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)
@@ -887,7 +892,7 @@ Otherwise, the rule is a compression rule, and compression is done with gzip.")
     ;; See if any suffix rule matches this file name.
     (while suffixes
       (let (case-fold-search)
-	(if (string-match-p (car (car suffixes)) file)
+	(if (string-match (car (car suffixes)) file)
 	    (setq suffix (car suffixes) suffixes nil))
 	(setq suffixes (cdr suffixes))))
     ;; If so, compute desired new name.