From aa6146e69d8d9d97424ccaf4d69db9eea64d0011 Mon Sep 17 00:00:00 2001 From: Michael Heerdegen Date: Mon, 29 Apr 2024 16:10:29 +0200 Subject: [PATCH] WIP: Try to fix #70593 --- lisp/dired-aux.el | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index e340f98a551..60a0f16bfe4 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -2331,18 +2331,21 @@ dired-rename-subdir-1 (if (dired-in-this-tree-p (car elt) expanded-dir) ;; ELT's subdir is affected by the rename (dired-rename-subdir-2 elt dir to))) - (if (equal dir default-directory) + (if (string= dir (expand-file-name default-directory)) ;; if top level directory was renamed, lots of things have to be ;; updated: (progn (dired-unadvertise dir) ; we no longer dired DIR... - (setq default-directory to - dired-directory (expand-file-name;; this is correct - ;; with and without wildcards - (file-name-nondirectory (if (stringp dired-directory) - dired-directory - (car dired-directory))) - to)) + (setq dired-directory + (abbreviate-file-name + (file-name-as-directory + (expand-file-name ;; this is correct + ;; with and without wildcards + (file-name-nondirectory (if (stringp dired-directory) + dired-directory + (car dired-directory))) + to))) + default-directory dired-directory) (let ((new-name (file-name-nondirectory (directory-file-name (if (stringp dired-directory) dired-directory -- 2.39.2