diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-11-09 15:07:10 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-11-09 15:07:10 -0500 |
| commit | d607b96bc2824116a8fe0e5840ce49da7ce4514f (patch) | |
| tree | 229a11bba88b67e8961db4d10aa8b3725f3a4873 /lisp/dired.el | |
| parent | 27410d0ac3406a341cc90ada064047a7f1ea5209 (diff) | |
| parent | c00980655bc15ca019fd6c559c69601be18f2407 (diff) | |
| download | emacs-d607b96bc2824116a8fe0e5840ce49da7ce4514f.tar.gz | |
Merge from emacs-23
Diffstat (limited to 'lisp/dired.el')
| -rw-r--r-- | lisp/dired.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/dired.el b/lisp/dired.el index 345956f029f..04ba6083c21 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -3539,7 +3539,7 @@ Ask means pop up a menu for the user to select one of copy, move or link." ;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command ;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown ;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff -;;;;;; dired-diff) "dired-aux" "dired-aux.el" "416d272299fd4774c47c2f677ee640a4") +;;;;;; dired-diff) "dired-aux" "dired-aux.el" "1628b7a7d379fb4da8ae4bf29faad4b5") ;;; Generated autoloads from dired-aux.el (autoload 'dired-diff "dired-aux" "\ |