summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorimmerrr <immerrr@gmail.com>2020-05-17 13:47:23 +0200
committerEli Zaretskii <eliz@gnu.org>2020-05-30 15:25:34 +0300
commit3dbe6530b124436550dae4db6cd4b7b380e95377 (patch)
treef12cd0d837bfb2b3a6c1b5139c75d23aee09738c /lisp
parent360d7c716dc49aeaa62bd2174e803e0a3eaeaa1b (diff)
downloademacs-3dbe6530b124436550dae4db6cd4b7b380e95377.tar.gz
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)
Diffstat (limited to 'lisp')
-rw-r--r--lisp/files.el2
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