From: immerrr <immerrr@gmail.com>
Date: Sun, 17 May 2020 11:47:23 +0000 (+0200)
Subject: Minor fix in 'find-alternate-file'
X-Git-Tag: emacs-28.0.90~7247
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3dbe6530b124436550dae4db6cd4b7b380e95377;p=emacs.git

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

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