aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/main.c3
-rw-r--r--src/nvim/version.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c
index ba545c0815..a876a0ad21 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -507,6 +507,9 @@ int main(int argc, char **argv)
no_wait_return = FALSE;
starting = 0;
+ // 'autochdir' has been postponed.
+ do_autochdir();
+
/* start in insert mode */
if (p_im)
need_start_insertmode = TRUE;
diff --git a/src/nvim/version.c b/src/nvim/version.c
index b2c6b332d1..aa3a34b3df 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -86,6 +86,7 @@ static int included_patches[] = {
1755,
1753,
1728,
+ 1716,
1695,
1654,
1652,