Merge remote-tracking branch 'vim/master'

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

src/version.c

@@ -786,6 +786,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1462,
 /**/
     1461,
 /**/