emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master dc5f6dcee2: Fix "C-x C-d" with wildcard arguments


From: Eli Zaretskii
Subject: master dc5f6dcee2: Fix "C-x C-d" with wildcard arguments
Date: Sun, 12 Jun 2022 06:04:33 -0400 (EDT)

branch: master
commit dc5f6dcee22982906eb09037ee04471b34bb4be7
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Fix "C-x C-d" with wildcard arguments
    
    * lisp/files.el (list-directory): Make sure 'default-directory' is
    set to a valid value if the argument DIRNAME included wildcards.
    (Bug#55877)
---
 lisp/files.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/files.el b/lisp/files.el
index 75a856c636..945b7ef737 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -7406,9 +7406,9 @@ and `list-directory-verbose-switches'."
     ;; Finishing with-output-to-temp-buffer seems to clobber default-directory.
     (with-current-buffer buffer
       (setq default-directory
-           (if (file-directory-p dirname)
+           (if (file-accessible-directory-p dirname)
                (file-name-as-directory dirname)
-             (file-name-directory dirname))))))
+             (file-name-directory (directory-file-name dirname)))))))
 
 (defun shell-quote-wildcard-pattern (pattern)
   "Quote characters special to the shell in PATTERN, leave wildcards alone.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]