diff options
| author | Chong Yidong | 2011-02-12 19:16:28 -0500 |
|---|---|---|
| committer | Chong Yidong | 2011-02-12 19:16:28 -0500 |
| commit | e730aabed55f3b65020672f1d58afc55fda4eef2 (patch) | |
| tree | db931d6586b8ce49b8428fcc45c83825b2c60252 /lisp/dired.el | |
| parent | d0ba09dcd877f4e8b6b7643c69d596ac88b545bc (diff) | |
| parent | 84eb0351d8be4811897c8cf62a69757ff5d14001 (diff) | |
| download | emacs-e730aabed55f3b65020672f1d58afc55fda4eef2.tar.gz emacs-e730aabed55f3b65020672f1d58afc55fda4eef2.zip | |
Merge changes from emacs-23 branch
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 3a76398e956..debf539ddb9 100644 --- a/lisp/dired.el +++ b/lisp/dired.el | |||
| @@ -3570,7 +3570,7 @@ Ask means pop up a menu for the user to select one of copy, move or link." | |||
| 3570 | ;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command | 3570 | ;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command |
| 3571 | ;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown | 3571 | ;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown |
| 3572 | ;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff | 3572 | ;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff |
| 3573 | ;;;;;; dired-diff) "dired-aux" "dired-aux.el" "9f5fc434fa6c2607b6e66060862c9caf") | 3573 | ;;;;;; dired-diff) "dired-aux" "dired-aux.el" "e66465bcd1687d66cfb1202c9963d567") |
| 3574 | ;;; Generated autoloads from dired-aux.el | 3574 | ;;; Generated autoloads from dired-aux.el |
| 3575 | 3575 | ||
| 3576 | (autoload 'dired-diff "dired-aux" "\ | 3576 | (autoload 'dired-diff "dired-aux" "\ |