diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2005-06-03 08:04:04 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2005-06-03 08:04:04 +0000 |
| commit | 899a431bae4a7b48a266c5da56610a5ea44febad (patch) | |
| tree | 38050620920c4ff4b5bd4dc2c4f3267dfe76eef2 /lisp/ediff-mult.el | |
| parent | d06e384795d5ca4e82c88273847eeb9d01380046 (diff) | |
| download | emacs-899a431bae4a7b48a266c5da56610a5ea44febad.tar.gz | |
2005-06-03 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-diff.el (ediff-same-contents) Eliminate CL-type functions.
* ediff-mult.el (ediff-intersect-directories) Make sure that ".." and
"." files are deleted from all file lists before comparison
* viper-keym.el
(viper-toggle-key,viper-quoted-insert-key,viper-ESC-key):
Made them customizable.
* viper.el (viper-non-hook-settings): fixed the names of defadvices.
Diffstat (limited to 'lisp/ediff-mult.el')
| -rw-r--r-- | lisp/ediff-mult.el | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el index 41a7699cfdc..88ab31fe56a 100644 --- a/lisp/ediff-mult.el +++ b/lisp/ediff-mult.el @@ -560,17 +560,23 @@ behavior." (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)) - (directory-files auxdir2 nil regexp))) + 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)) - (directory-files auxdir3 nil regexp)))) + lis3))) (if (ediff-nonempty-string-p merge-autostore-dir) (setq merge-autostore-dir |