[Emacs-diffs] Changes to emacs/lisp/ediff-mult.el

[Michael Kifer]

Index: emacs/lisp/ediff-mult.el
diff -c emacs/lisp/ediff-mult.el:1.36 emacs/lisp/ediff-mult.el:1.37
*** emacs/lisp/ediff-mult.el:1.36       Sat Feb 19 04:46:24 2005
--- emacs/lisp/ediff-mult.el    Fri Jun  3 08:04:04 2005
***************
*** 560,576 ****
                           (ediff-add-slash-if-directory auxdir1 elt))
                         lis1)
          auxdir2       (file-name-as-directory dir2)
          lis2          (mapcar
                         (lambda (elt)
                           (ediff-add-slash-if-directory auxdir2 elt))
!                        (directory-files auxdir2 nil regexp)))
  
      (if (stringp dir3)
        (setq auxdir3   (file-name-as-directory dir3)
              lis3      (mapcar
                         (lambda (elt)
                           (ediff-add-slash-if-directory auxdir3 elt))
!                        (directory-files auxdir3 nil regexp))))
  
      (if (ediff-nonempty-string-p merge-autostore-dir)
        (setq merge-autostore-dir
--- 560,582 ----
                           (ediff-add-slash-if-directory auxdir1 elt))
                         lis1)
          auxdir2       (file-name-as-directory dir2)
+         lis2          (directory-files auxdir2 nil regexp)
+         lis2          (delete "."  lis2)
+         lis2          (delete ".." lis2)
          lis2          (mapcar
                         (lambda (elt)
                           (ediff-add-slash-if-directory auxdir2 elt))
!                        lis2))
  
      (if (stringp dir3)
        (setq auxdir3   (file-name-as-directory dir3)
+             lis3      (directory-files auxdir3 nil regexp)
+             lis3      (delete "."  lis3)
+             lis3      (delete ".." lis3)
              lis3      (mapcar
                         (lambda (elt)
                           (ediff-add-slash-if-directory auxdir3 elt))
!                        lis3)))
  
      (if (ediff-nonempty-string-p merge-autostore-dir)
        (setq merge-autostore-dir