updated for version 7.3.061
Problem: Remote ":drop" does not respect 'autochdir'. (Peter Odding)
Solution: Don't restore the directory when 'autochdir' is set. (Benjamin
Fritz)
diff --git a/src/main.c b/src/main.c
index cc99d1f..faf574a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3817,6 +3817,8 @@
/* Check if we have at least one argument. */
if (filec <= 0)
mainerr_arg_missing((char_u *)filev[-1]);
+
+ /* Temporarily cd to the current directory to handle relative file names. */
if (mch_dirname(cwd, MAXPATHL) != OK)
return NULL;
if ((p = vim_strsave_escaped_ext(cwd,
@@ -3858,13 +3860,20 @@
ga_concat(&ga, p);
vim_free(p);
}
+ ga_concat(&ga, (char_u *)"|if exists('*inputrestore')|call inputrestore()|endif<CR>");
+
/* The :drop commands goes to Insert mode when 'insertmode' is set, use
* CTRL-\ CTRL-N again. */
- ga_concat(&ga, (char_u *)"|if exists('*inputrestore')|call inputrestore()|endif<CR>");
- ga_concat(&ga, (char_u *)"<C-\\><C-N>:cd -");
+ ga_concat(&ga, (char_u *)"<C-\\><C-N>");
+
+ /* Switch back to the correct current directory (prior to temporary path
+ * switch) unless 'autochdir' is set, in which case it will already be
+ * correct after the :drop command. */
+ ga_concat(&ga, (char_u *)":if !exists('+acd')||!&acd|cd -|endif<CR>");
+
if (sendReply)
- ga_concat(&ga, (char_u *)"<CR>:call SetupRemoteReplies()");
- ga_concat(&ga, (char_u *)"<CR>:");
+ ga_concat(&ga, (char_u *)":call SetupRemoteReplies()<CR>");
+ ga_concat(&ga, (char_u *)":");
if (inicmd != NULL)
{
/* Can't use <CR> after "inicmd", because an "startinsert" would cause
diff --git a/src/version.c b/src/version.c
index bb42828..d46d9a0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 61,
+/**/
60,
/**/
59,