From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 11 Jul 2005 04:25:01 +0000 (+0000)
Subject: (dired-compare-directories): Remove "." and ".." from the alists.
X-Git-Tag: emacs-pretest-22.0.90~8235
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5176af43d1492c5d9c92a5b91db0b4b08a10749e;p=emacs.git

(dired-compare-directories): Remove "." and ".." from the alists.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5f6f751ec5b..b99648474e4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2005-07-11  Richard M. Stallman  <rms@gnu.org>
 
+	* dired-aux.el (dired-compare-directories): Remove "." and ".."
+	from the alists.
+
 	* emacs-lisp/edebug.el (edebug-slow-after, edebug-slow-before):
 	Do nothing if edebug-active.
 
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index c9d5c22ded3..617cb38585f 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -126,16 +126,21 @@ Examples of PREDICATE:
   (let* ((dir1 (dired-current-directory))
          (file-alist1 (dired-files-attributes dir1))
          (file-alist2 (dired-files-attributes dir2))
-	 (file-list1 (mapcar
+	 file-list1 file-list2)
+    (setq file-alist1 (delq (assoc "." file-alist1) file-alist1))
+    (setq file-alist1 (delq (assoc ".." file-alist1) file-alist1))
+    (setq file-alist2 (delq (assoc "." file-alist2) file-alist2))
+    (setq file-alist2 (delq (assoc ".." file-alist2) file-alist2))
+    (setq file-list1 (mapcar
 		      'cadr
                       (dired-file-set-difference
                        file-alist1 file-alist2
-		       predicate)))
-	 (file-list2 (mapcar
+		       predicate))
+	  file-list2 (mapcar
 		      'cadr
                       (dired-file-set-difference
                        file-alist2 file-alist1
-		       predicate))))
+		       predicate)))
     (dired-fun-in-all-buffers
      dir1 nil
      (lambda ()