Minor fix in 'find-alternate-file'

This fixes the use case when, for example, 'find-file-hooks'
fails.
* lisp/files.el (find-alternate-file): If buffer 'oname' exists,
kill it before renaming the new one.  (Bug#41359)

1 files changed, 2 insertions, 0 deletions

diff --git a/lisp/files.el b/lisp/files.el
index cefae20ab56..742fd78df1d 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1921,6 +1921,8 @@ killed."
         (setq buffer-file-truename otrue)
         (setq dired-directory odir)
         (lock-buffer)
+        (if (get-buffer oname)
+            (kill-buffer oname))
         (rename-buffer oname)))
     (unless (eq (current-buffer) obuf)
       (with-current-buffer obuf