diff options
| author | Juri Linkov <juri@jurta.org> | 2012-09-19 23:09:55 +0300 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2012-09-19 23:09:55 +0300 |
| commit | 127342224ea0971d14077f9290d91064972c78ca (patch) | |
| tree | f6464ecd9ea37e7c5534197993300044c7a3fd50 /lisp/dired-aux.el | |
| parent | ce97595bd4604270075a0a7ff04bceaa97b42d9f (diff) | |
| download | emacs-127342224ea0971d14077f9290d91064972c78ca.tar.gz | |
* lisp/dired-aux.el (dired-diff): Add (require 'diff) because
`diff-latest-backup-file' is not autoloaded.
(dired-do-chxxx, dired-do-chmod): Set `no-error-if-not-filep' arg
of `dired-get-filename' to t to not report error when there is
no default file on the current line.
Diffstat (limited to 'lisp/dired-aux.el')
| -rw-r--r-- | lisp/dired-aux.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index 7ba67050337..3d3fe491899 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -70,7 +70,7 @@ the string of command switches for the third argument of `diff'." (interactive (let* ((current (dired-get-filename t)) ;; Get the latest existing backup file. - (oldf (diff-latest-backup-file current)) + (oldf (progn (require 'diff) (diff-latest-backup-file current))) ;; Get the file at the mark. (file-at-mark (if (and transient-mark-mode mark-active) (save-excursion (goto-char (mark t)) @@ -248,7 +248,7 @@ List has a form of (file-name full-file-name (attribute-list))." ;; ARG describes which files to use, as in `dired-get-marked-files'. (let* ((files (dired-get-marked-files t arg)) ;; The source of default file attributes is the file at point. - (default-file (dired-get-filename t)) + (default-file (dired-get-filename t t)) (default (when default-file (cond ((eq op-symbol 'touch) (format-time-string @@ -300,7 +300,7 @@ into the minibuffer." (interactive "P") (let* ((files (dired-get-marked-files t arg)) ;; The source of default file attributes is the file at point. - (default-file (dired-get-filename t)) + (default-file (dired-get-filename t t)) (modestr (when default-file (nth 8 (file-attributes default-file)))) (default |