diff options
| author | Glenn Morris | 2011-07-02 06:23:45 -0400 |
|---|---|---|
| committer | Glenn Morris | 2011-07-02 06:23:45 -0400 |
| commit | a9e2a8db83243a5ef0fd6e80593af3f2a1a9cf0c (patch) | |
| tree | 2fdd0a5524aa2df6ebf51db8a72790630995db83 | |
| parent | 8b538a3cf6fa43c7befba7d135f980f2a1c3c904 (diff) | |
| download | emacs-a9e2a8db83243a5ef0fd6e80593af3f2a1a9cf0c.tar.gz emacs-a9e2a8db83243a5ef0fd6e80593af3f2a1a9cf0c.zip | |
Auto-commit of loaddefs files.
| -rw-r--r-- | lisp/dired.el | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/dired.el b/lisp/dired.el index 54a103e39fd..c446b5d3dfa 100644 --- a/lisp/dired.el +++ b/lisp/dired.el | |||
| @@ -3628,16 +3628,16 @@ Ask means pop up a menu for the user to select one of copy, move or link." | |||
| 3628 | ;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command | 3628 | ;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command |
| 3629 | ;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown | 3629 | ;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown |
| 3630 | ;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff | 3630 | ;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff |
| 3631 | ;;;;;; dired-diff) "dired-aux" "dired-aux.el" "7efcfe4f9e0913ae4a87be014010c27f") | 3631 | ;;;;;; dired-diff) "dired-aux" "dired-aux.el" "65e65633e08c3e4b4a4b1c735f2f48b8") |
| 3632 | ;;; Generated autoloads from dired-aux.el | 3632 | ;;; Generated autoloads from dired-aux.el |
| 3633 | 3633 | ||
| 3634 | (autoload 'dired-diff "dired-aux" "\ | 3634 | (autoload 'dired-diff "dired-aux" "\ |
| 3635 | Compare file at point with file FILE using `diff'. | 3635 | Compare file at point with file FILE using `diff'. |
| 3636 | FILE defaults to the file at the mark. (That's the mark set by | 3636 | FILE defaults to the file at the mark. (That's the mark set by |
| 3637 | \\[set-mark-command], not by Dired's \\[dired-mark] command.) | 3637 | \\[set-mark-command], not by Dired's \\[dired-mark] command.) |
| 3638 | The prompted-for file is the first file given to `diff'. | 3638 | The prompted-for FILE is the first file given to `diff'. |
| 3639 | With prefix arg, prompt for second argument SWITCHES, | 3639 | With prefix arg, prompt for second argument SWITCHES, |
| 3640 | which is options for `diff'. | 3640 | which is the string of command switches for `diff'. |
| 3641 | 3641 | ||
| 3642 | \(fn FILE &optional SWITCHES)" t nil) | 3642 | \(fn FILE &optional SWITCHES)" t nil) |
| 3643 | 3643 | ||
| @@ -4080,8 +4080,9 @@ with the command \\[tags-loop-continue]. | |||
| 4080 | 4080 | ||
| 4081 | (autoload 'dired-show-file-type "dired-aux" "\ | 4081 | (autoload 'dired-show-file-type "dired-aux" "\ |
| 4082 | Print the type of FILE, according to the `file' command. | 4082 | Print the type of FILE, according to the `file' command. |
| 4083 | If FILE is a symbolic link and the optional argument DEREF-SYMLINKS is | 4083 | If you give a prefix to this command, and FILE is a symbolic |
| 4084 | true then the type of the file linked to by FILE is printed instead. | 4084 | link, then the type of the file linked to by FILE is printed |
| 4085 | instead. | ||
| 4085 | 4086 | ||
| 4086 | \(fn FILE &optional DEREF-SYMLINKS)" t nil) | 4087 | \(fn FILE &optional DEREF-SYMLINKS)" t nil) |
| 4087 | 4088 | ||