emacs/gnu.emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2026-09-10 07:46:51 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Dired problem with nonexistent directory (bug#81509)

Browse source 
* lisp/dired.el (dired, dired-other-window, dired-other-frame)
(dired-other-tab): If the directory that the Dired command tries
to visit does not exist, ensure the buffer that was current when
the command was invoked remains the current buffer.
This commit is contained in:
Stephen Berman 2026-07-28 18:31:44 +02:00
parent 158a039135
commit ab88a0be86
1 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
lisp/dired.el
View file

@ -1238,8 +1238,11 @@ Type \\[describe-mode] after entering Dired for more info.
If DIRNAME is already in a Dired buffer, that buffer is used without refresh."
;; Cannot use (interactive "D") because of wildcards.
(interactive (dired-read-dir-and-switches ""))
(prog1 (pop-to-buffer-same-window (dired-noselect dirname switches))
(dired--display-ls-error)))
(let ((buf (dired-noselect dirname switches)))
(prog1 (if buf
(pop-to-buffer-same-window buf)
(current-buffer))
(dired--display-ls-error))))
;; This lets clicks on the menu bar invoke Dired even if some feature
;; remaps the Dired command to another command that does not handle this
@ -1258,24 +1261,33 @@ If this command needs to split the current window, it by default obeys
the user options `split-height-threshold' and `split-width-threshold',
when it decides whether to split the window horizontally or vertically."
(interactive (dired-read-dir-and-switches "in other window "))
(prog1 (switch-to-buffer-other-window (dired-noselect dirname switches))
(dired--display-ls-error)))
(let ((buf (dired-noselect dirname switches)))
(prog1 (if buf
(switch-to-buffer-other-window buf)
(current-buffer))
(dired--display-ls-error))))
;;;###autoload (keymap-set ctl-x-5-map "d" #'dired-other-frame)
;;;###autoload
(defun dired-other-frame (dirname &optional switches)
"\"Edit\" directory DIRNAME. Like `dired' but make a new frame."
(interactive (dired-read-dir-and-switches "in other frame "))
(prog1 (switch-to-buffer-other-frame (dired-noselect dirname switches))
(dired--display-ls-error)))
(let ((buf (dired-noselect dirname switches)))
(prog1 (if buf
(switch-to-buffer-other-frame buf)
(current-buffer))
(dired--display-ls-error))))
;;;###autoload (keymap-set tab-prefix-map "d" #'dired-other-tab)
;;;###autoload
(defun dired-other-tab (dirname &optional switches)
"\"Edit\" directory DIRNAME. Like `dired' but make a new tab."
(interactive (dired-read-dir-and-switches "in other tab "))
(prog1 (switch-to-buffer-other-tab (dired-noselect dirname switches))
(dired--display-ls-error)))
(let ((buf (dired-noselect dirname switches)))
(prog1 (if buf
(switch-to-buffer-other-tab buf)
(current-buffer))
(dired--display-ls-error))))
;;;###autoload
(defun dired-noselect (dir-or-list &optional switches)