mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-24 06:20:43 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/files.el (find-alternate-file): Fix the order of restoring buffer.

Browse source 
Swap the order of restoring original buffer's file names and
restoring original's buffer name with 'rename-buffer' (bug#68235).
This commit is contained in:
Juri Linkov 2024-04-22 09:45:40 +03:00
parent 7d6f4d9085
commit d51b0d2ebe
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/files.el
View file

@ -2113,15 +2113,15 @@ killed."
(rename-buffer oname))) (rename-buffer oname)))
(unless (eq (current-buffer) obuf) (unless (eq (current-buffer) obuf)
(with-current-buffer obuf (with-current-buffer obuf
(unless (get-buffer oname)
;; Restore original's buffer name so 'kill-buffer' can use it
;; to assign its last name (Bug#68235).
(rename-buffer oname))
;; Restore original buffer's file names so they can be still ;; Restore original buffer's file names so they can be still
;; used when referencing the now defunct buffer (Bug#68235). ;; used when referencing the now defunct buffer (Bug#68235).
(setq buffer-file-name ofile) (setq buffer-file-name ofile)
(setq buffer-file-number onum) (setq buffer-file-number onum)
(setq buffer-file-truename otrue) (setq buffer-file-truename otrue)
(unless (get-buffer oname)
;; Restore original's buffer name so 'kill-buffer' can use it
;; to assign its last name (Bug#68235).
(rename-buffer oname))
;; We already ran these; don't run them again. ;; We already ran these; don't run them again.
(let (kill-buffer-query-functions kill-buffer-hook) (let (kill-buffer-query-functions kill-buffer-hook)
(kill-buffer obuf)))))) (kill-buffer obuf))))))