From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Fri, 4 Sep 2020 13:50:48 +0000 (+0200)
Subject: Fix previous manual mis-merge of dired-aux
X-Git-Tag: emacs-28.0.90~6249
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9e5fd29bede00905d7ff95ea213c2e2f47944e61;p=emacs.git

Fix previous manual mis-merge of dired-aux

* lisp/dired-aux.el (dired-rename-file): Fix manual mis-merge of
previous patch.
---

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)