From: Eshel Yaron Date: Tue, 4 Jun 2024 20:26:36 +0000 (+0200) Subject: * lisp/dired.el (dired-noselect): Simplify X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c4c81b82d6f813a475851de6c4c53491b847524d;p=emacs.git * lisp/dired.el (dired-noselect): Simplify --- diff --git a/lisp/dired.el b/lisp/dired.el index f5dd96c3ef9..74ddfa9b775 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -1209,16 +1209,12 @@ If DIRNAME is already in a Dired buffer, that buffer is used without refresh." (or dir-or-list (setq dir-or-list default-directory)) ;; This loses the distinction between "/foo/*/" and "/foo/*" that ;; some shells make: - (let (dirname initially-was-dirname) - (if (consp dir-or-list) - (setq dirname (car dir-or-list)) - (setq dirname dir-or-list)) - (setq initially-was-dirname - (string= (file-name-as-directory dirname) dirname)) - (setq dirname (abbreviate-file-name - (expand-file-name (directory-file-name dirname)))) - (if find-file-visit-truename - (setq dirname (file-truename dirname))) + (let* ((initial (car (ensure-list dir-or-list))) + (initially-was-dirname (string= (file-name-as-directory initial) + initial)) + (dirname (abbreviate-file-name + (expand-file-name (directory-file-name initial))))) + (when find-file-visit-truename (setq dirname (file-truename dirname))) ;; If the argument was syntactically a directory name not a file name, ;; or if it happens to name a file that is a directory, ;; convert it syntactically to a directory name.