summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2020-09-04 15:50:48 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2020-09-04 15:50:48 +0200
commit9e5fd29bede00905d7ff95ea213c2e2f47944e61 (patch)
treebcb419128a1444dfff3af77fae9eb8b36c8b6ad8
parent9e5db99d3183a849c67ef3dd1c7d3adb0aa3b4b7 (diff)
downloademacs-9e5fd29bede00905d7ff95ea213c2e2f47944e61.tar.gz
Fix previous manual mis-merge of dired-aux
* lisp/dired-aux.el (dired-rename-file): Fix manual mis-merge of previous patch.
-rw-r--r--lisp/dired-aux.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index eeb06beafd3..82f4455392e 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1689,7 +1689,8 @@ unless OK-IF-ALREADY-EXISTS is non-nil."
(set-visited-file-name newname nil t)))
(dired-remove-file file)
;; See if it's an inserted subdir, and rename that, too.
- (dired-rename-subdir file newname))
+ (when (file-directory-p file)
+ (dired-rename-subdir file newname)))
(defun dired-rename-subdir (from-dir to-dir)
(setq from-dir (file-name-as-directory from-dir)