Merge remote-tracking branch 'vim/master'

splhack · splhack · commit 2a1a16b2f072 · 2018-02-03T10:22:58.000-08:00
diff --git a/src/gui.c b/src/gui.c
@@ -5590,7 +5590,7 @@ gui_handle_drop(
 		if (mch_chdir((char *)p) == 0)
 		    shorten_fnames(TRUE);
 	    }
-	    else if (vim_chdirfile(p) == OK)
+	    else if (vim_chdirfile(p, "drop") == OK)
 		shorten_fnames(TRUE);
 	    vim_free(p);
 	}
diff --git a/src/version.c b/src/version.c
@@ -786,6 +786,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1462,
 /**/
     1461,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -5590,7 +5590,7 @@ gui_handle_drop(`
`5590`	`5590`	`if (mch_chdir((char *)p) == 0)`
`5591`	`5591`	`shorten_fnames(TRUE);`
`5592`	`5592`	`}`
`5593`		`- else if (vim_chdirfile(p) == OK)`
	`5593`	`+ else if (vim_chdirfile(p, "drop") == OK)`
`5594`	`5594`	`shorten_fnames(TRUE);`
`5595`	`5595`	`vim_free(p);`
`5596`	`5596`	`}`