summaryrefslogtreecommitdiff
path: root/lisp/dired-aux.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/dired-aux.el')
-rw-r--r--lisp/dired-aux.el8
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 095ce8ba89c..17dae6085df 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1623,10 +1623,14 @@ Special value `always' suppresses confirmation."
(setq default-directory to
dired-directory (expand-file-name;; this is correct
;; with and without wildcards
- (file-name-nondirectory dired-directory)
+ (file-name-nondirectory (if (stringp dired-directory)
+ dired-directory
+ (car dired-directory)))
to))
(let ((new-name (file-name-nondirectory
- (directory-file-name dired-directory))))
+ (directory-file-name (if (stringp dired-directory)
+ dired-directory
+ (car dired-directory))))))
;; try to rename buffer, but just leave old name if new
;; name would already exist (don't try appending "<%d>")
(or (get-buffer new-name)