master 9e5fd29: Fix previous manual mis-merge of dired-aux

[Lars Ingebrigtsen]

branch: master
commit 9e5fd29bede00905d7ff95ea213c2e2f47944e61
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Fix previous manual mis-merge of dired-aux
    
    * lisp/dired-aux.el (dired-rename-file): Fix manual mis-merge of
    previous patch.
---
 lisp/dired-aux.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index eeb06be..82f4455 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)