summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-02-03 18:01:37 +0100
committerBram Moolenaar <Bram@vim.org>2018-02-03 18:01:37 +0100
commitb5cb65ba2bcc6bbc6d2798a2dea18b95f0b38f5e (patch)
treed5c80b77e3b6bbe3bff5d99f98432c3cc0878bdd
parentb7407d3fc9496f9048fb65ab17b5ba3444965c0e (diff)
patch 8.0.1460: missing file in patchv8.0.1460
Problem: Missing file in patch. Solution: Add changes to missing file.
-rw-r--r--src/misc2.c11
-rw-r--r--src/version.c2
2 files changed, 11 insertions, 2 deletions
diff --git a/src/misc2.c b/src/misc2.c
index 66aeee01b7..f089051efd 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -3389,13 +3389,20 @@ same_directory(char_u *f1, char_u *f2)
* Return OK or FAIL.
*/
int
-vim_chdirfile(char_u *fname)
+vim_chdirfile(char_u *fname, char *trigger_autocmd UNUSED)
{
char_u dir[MAXPATHL];
+ int res;
vim_strncpy(dir, fname, MAXPATHL - 1);
*gettail_sep(dir) = NUL;
- return mch_chdir((char *)dir) == 0 ? OK : FAIL;
+ res = mch_chdir((char *)dir) == 0 ? OK : FAIL;
+#ifdef FEAT_AUTOCMD
+ if (res == OK && trigger_autocmd != NULL)
+ apply_autocmds(EVENT_DIRCHANGED, (char_u *)trigger_autocmd,
+ dir, FALSE, curbuf);
+#endif
+ return res;
}
#endif
diff --git a/src/version.c b/src/version.c
index 4706262acd..d3670bcdaa 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1460,
+/**/
1459,
/**/
1458,