martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

; * lisp/dired.el (dired-readin-insert): Fix a recent change (bug#80499).

Browse Source
This commit is contained in:
Eli Zaretskii
2026-04-11 15:39:47 +03:00
parent e8203e3142
commit 15f1b565a2
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lisp/dired.el
View File

@@ -1622,18 +1622,20 @@ wildcards, erases the buffer, and builds the subdir-alist anew
;; Every time `temporary-file-directory' is (re)displayed in Dired a
;; new `ls' error file is created and the Dired buffer has an entry
;; for it. The file itself is deleted in `insert-directory' but its
;; Dired entry remains, so we remove it here.
(let ((tmpbuf (dired-find-buffer-nocreate temporary-file-directory)))
(when tmpbuf
(with-current-buffer tmpbuf
(widen)
(goto-char (point-min))
(when (search-forward (file-name-base dired--ls-error-file) nil t)
;; The call chain of `dired-remove-entry' requires non-nil
;; `dired-subdir-alist', but here it is nil, so we set it.
(let ((dired-subdir-alist `((,temporary-file-directory
. ,(point-min-marker)))))
(dired-remove-entry dired--ls-error-file))))))))
;; Dired entry remains, so we remove it here. This is not relevant
;; if ls-lisp emulation is used.
(when (files--use-insert-directory-program-p)
(let ((tmpbuf (dired-find-buffer-nocreate temporary-file-directory)))
(when tmpbuf
(with-current-buffer tmpbuf
(widen)
(goto-char (point-min))
(when (search-forward (file-name-base dired--ls-error-file) nil t)
;; The call chain of `dired-remove-entry' requires non-nil
;; `dired-subdir-alist', but here it is nil, so we set it.
(let ((dired-subdir-alist `((,temporary-file-directory
. ,(point-min-marker)))))
(dired-remove-entry dired--ls-error-file)))))))))
(defun dired-align-file (beg end)
"Align the fields of a file to the ones of surrounding lines.