* 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).

1 files changed, 4 insertions, 4 deletions

diff --git a/lisp/files.el b/lisp/files.el
index 1e11dd44bad..9f5ed85ce60 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2113,15 +2113,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))))))