diff options
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/dired-aux.el | 10 |
2 files changed, 14 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 60ccc271e26..90a9098cb06 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2005-03-24 Juri Linkov <juri@jurta.org> + + * dired.el (dired-mode-map): Add menu item "Compare directories" + for dired-compare-directories. + + * dired-aux.el (dired-compare-directories): Add autoload cookie. + Doc fix. Replace `read-file-name' with `read-directory-name'. + 2005-03-24 Stefan <monnier@iro.umontreal.ca> * term/xterm.el: If running in Terminal.app set coding-system to utf-8. diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index 2e210d084ba..9a1449823ca 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -91,13 +91,14 @@ With prefix arg, prompt for argument SWITCHES which is options for `diff'." nil)) (diff-backup (dired-get-filename) switches)) +;;;###autoload (defun dired-compare-directories (dir2 predicate) "Mark files with different file attributes in two dired buffers. Compare file attributes of files in the current directory with file attributes in directory DIR2 using PREDICATE on pairs of files with the same name. Mark files for which PREDICATE returns non-nil. Mark files with different names if PREDICATE is nil (or interactively -when the user enters empty input at the predicate prompt). +with empty input at the predicate prompt). PREDICATE is a Lisp expression that can refer to the following variables: @@ -117,9 +118,10 @@ Examples of PREDICATE: (not (and (= (nth 2 fa1) (nth 2 fa2)) - mark files with different UID (= (nth 3 fa1) (nth 3 fa2)))) and GID." (interactive - (list (read-file-name (format "Compare %s with: " - (dired-current-directory)) - (dired-dwim-target-directory)) + (list (read-directory-name (format "Compare %s with: " + (dired-current-directory)) + (dired-dwim-target-directory) + (dired-dwim-target-directory)) (read-from-minibuffer "Mark if (lisp expr or RET): " nil nil t nil "nil"))) (let* ((dir1 (dired-current-directory)) (file-alist1 (dired-files-attributes dir1)) |