# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1517679905 -3600
# Node ID 1bf3519889d30263a81d969f037c14212834fe60
# Parent  7babbf8be7637119259b5356c3b7a6ba3c98e905
patch 8.0.1461: missing another file in patch

commit https://github.com/vim/vim/commit/15833239a4131279935a4bd574b74fe3a2b0f49f
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Feb 3 18:33:17 2018 +0100

    patch 8.0.1461: missing another file in patch

    Problem:    Missing another file in patch.
    Solution:   Add changes to missing file.

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -4368,8 +4368,22 @@ do_ecmd(
     if (p_im)
 	need_start_insertmode = TRUE;
 
-    /* Change directories when the 'acd' option is set. */
-    DO_AUTOCHDIR
+#ifdef FEAT_AUTOCHDIR
+    /* Change directories when the 'acd' option is set and we aren't already in
+     * that directory (should already be done above). Expect getcwd() to be
+     * faster than calling shorten_fnames() unnecessarily. */
+    if (p_acd && curbuf->b_ffname != NULL)
+    {
+	char_u	curdir[MAXPATHL];
+	char_u	filedir[MAXPATHL];
+
+	vim_strncpy(filedir, curbuf->b_ffname, MAXPATHL - 1);
+	*gettail_sep(filedir) = NUL;
+	if (mch_dirname(curdir, MAXPATHL) != FAIL
+		&& vim_fnamecmp(curdir, filedir) != 0)
+	    do_autochdir();
+    }
+#endif
 
 #if defined(FEAT_SUN_WORKSHOP) || defined(FEAT_NETBEANS_INTG)
     if (curbuf->b_ffname != NULL)
diff --git a/src/version.c b/src/version.c
--- 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 */
 /**/
+    1461,
+/**/
     1460,
 /**/
     1459,