diff options
Diffstat (limited to 'lisp/dired.el')
| -rw-r--r-- | lisp/dired.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/dired.el b/lisp/dired.el index 215906a32d4..6192b0a870e 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -3558,7 +3558,7 @@ Thus, use \\[backward-page] to find the beginning of a group of errors." (let ((inhibit-read-only t)) (cond ((stringp log) (insert (if args - (apply (function format) log args) + (apply #'format-message log args) log))) ((bufferp log) (insert-buffer-substring log)) @@ -3811,7 +3811,8 @@ Ask means pop up a menu for the user to select one of copy, move or link." ((memq action '(copy private move link)) (let ((overwrite (and (file-exists-p to) (y-or-n-p - (format "Overwrite existing file `%s'? " to)))) + (format-message + "Overwrite existing file `%s'? " to)))) ;; Binding dired-overwrite-confirmed to nil makes ;; dired-handle-overwrite a no-op. We instead use ;; y-or-n-p, which pops a graphical menu. @@ -3824,7 +3825,7 @@ Ask means pop up a menu for the user to select one of copy, move or link." (car (find-backup-file-name to))) (or (eq dired-backup-overwrite 'always) (y-or-n-p - (format + (format-message "Make backup for existing file `%s'? " to)))) (rename-file to backup-file 0) (dired-relist-entry backup-file)) |