Commit 12734222 authored by Juri Linkov's avatar Juri Linkov
Browse files

* 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.
parent ce97595b
2012-09-19 Juri Linkov <juri@jurta.org>
* 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.
2012-09-19 Stefan Monnier <monnier@iro.umontreal.ca> 2012-09-19 Stefan Monnier <monnier@iro.umontreal.ca>
   
* emacs-lisp/macroexp.el (macroexp--funcall-if-compiled): Rename from * emacs-lisp/macroexp.el (macroexp--funcall-if-compiled): Rename from
......
...@@ -70,7 +70,7 @@ the string of command switches for the third argument of `diff'." ...@@ -70,7 +70,7 @@ the string of command switches for the third argument of `diff'."
(interactive (interactive
(let* ((current (dired-get-filename t)) (let* ((current (dired-get-filename t))
;; Get the latest existing backup file. ;; 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. ;; Get the file at the mark.
(file-at-mark (if (and transient-mark-mode mark-active) (file-at-mark (if (and transient-mark-mode mark-active)
(save-excursion (goto-char (mark t)) (save-excursion (goto-char (mark t))
...@@ -248,7 +248,7 @@ List has a form of (file-name full-file-name (attribute-list))." ...@@ -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'. ;; ARG describes which files to use, as in `dired-get-marked-files'.
(let* ((files (dired-get-marked-files t arg)) (let* ((files (dired-get-marked-files t arg))
;; The source of default file attributes is the file at point. ;; 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 (default (when default-file
(cond ((eq op-symbol 'touch) (cond ((eq op-symbol 'touch)
(format-time-string (format-time-string
...@@ -300,7 +300,7 @@ into the minibuffer." ...@@ -300,7 +300,7 @@ into the minibuffer."
(interactive "P") (interactive "P")
(let* ((files (dired-get-marked-files t arg)) (let* ((files (dired-get-marked-files t arg))
;; The source of default file attributes is the file at point. ;; 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 (modestr (when default-file
(nth 8 (file-attributes default-file)))) (nth 8 (file-attributes default-file))))
(default (default
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment