From: Juri Linkov <juri@linkov.net>
Date: Mon, 22 Apr 2024 06:45:40 +0000 (+0300)
Subject: * lisp/files.el (find-alternate-file): Fix the order of restoring buffer.
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4b15be564b1c655c31b53965f1adc6f9e4edda18;p=emacs.git

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

Swap the order of restoring original buffer's file names and
restoring original's buffer name with 'rename-buffer' (bug#68235).

(cherry picked from commit d51b0d2ebe4d0f55993e8e13f6d35b1eb23abf52)
---

diff --git a/lisp/files.el b/lisp/files.el
index 605d9b03d05..e80d2edc3fe 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2133,15 +2133,15 @@ killed."
 	(rename-buffer oname)))
     (unless (eq (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
 	;; used when referencing the now defunct buffer (Bug#68235).
 	(setq buffer-file-name ofile)
 	(setq buffer-file-number onum)
 	(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.
 	(let (kill-buffer-query-functions kill-buffer-hook)
 	  (kill-buffer obuf))))))