updated for version 7.0-087
diff --git a/src/window.c b/src/window.c
index 4d09ad6..0300b55 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3954,13 +3954,8 @@
setmouse(); /* in case jumped to/from help buffer */
#endif
-#ifdef FEAT_AUTOCHDIR
- /* Change directories when the 'acd' option is set on and after
- * switching windows. */
- if (p_acd && curbuf->b_ffname != NULL
- && vim_chdirfile(curbuf->b_ffname) == OK)
- shorten_fnames(TRUE);
-#endif
+ /* Change directories when the 'acd' option is set. */
+ DO_AUTOCHDIR
}
#endif /* FEAT_WINDOWS */