From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Thu, 17 Dec 2020 11:32:29 +0000 (+0100)
Subject: Fix fallback use of write-file in ido-mode
X-Git-Tag: emacs-28.0.90~4679
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=526abadd071e8c2cd67b91c2e282b44e01917fdb;p=emacs.git

Fix fallback use of write-file in ido-mode

* lisp/ido.el (ido-file-internal): Make `write-file' respect the
directory we've navigated to (bug#28513).
---

diff --git a/lisp/ido.el b/lisp/ido.el
index 5758d3fdeac..99241ce1a3a 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -2367,7 +2367,16 @@ If cursor is not at the end of the user input, move to end of input."
 	      (read-file-name-function nil))
 	  (setq this-command (or ido-fallback fallback 'find-file))
 	  (run-hook-with-args 'ido-before-fallback-functions this-command)
-	  (call-interactively this-command)))
+          (if (eq this-command 'write-file)
+              (write-file (read-file-name
+                           "Write file: "
+                           default-directory
+                           (and buffer-file-name
+                                (expand-file-name
+                                 (file-name-nondirectory buffer-file-name)
+                                 default-directory)))
+                          t)
+	    (call-interactively this-command))))
 
        ((eq ido-exit 'switch-to-buffer)
 	(ido-buffer-internal