Skip to content

Commit 1583323

Browse files
committed
patch 8.0.1461: missing another file in patch
Problem: Missing another file in patch. Solution: Add changes to missing file.
1 parent b5cb65b commit 1583323

2 files changed

Lines changed: 18 additions & 2 deletions

File tree

src/ex_cmds.c

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4368,8 +4368,22 @@ do_ecmd(
43684368
if (p_im)
43694369
need_start_insertmode = TRUE;
43704370

4371-
/* Change directories when the 'acd' option is set. */
4372-
DO_AUTOCHDIR
4371+
#ifdef FEAT_AUTOCHDIR
4372+
/* Change directories when the 'acd' option is set and we aren't already in
4373+
* that directory (should already be done above). Expect getcwd() to be
4374+
* faster than calling shorten_fnames() unnecessarily. */
4375+
if (p_acd && curbuf->b_ffname != NULL)
4376+
{
4377+
char_u curdir[MAXPATHL];
4378+
char_u filedir[MAXPATHL];
4379+
4380+
vim_strncpy(filedir, curbuf->b_ffname, MAXPATHL - 1);
4381+
*gettail_sep(filedir) = NUL;
4382+
if (mch_dirname(curdir, MAXPATHL) != FAIL
4383+
&& vim_fnamecmp(curdir, filedir) != 0)
4384+
do_autochdir();
4385+
}
4386+
#endif
43734387

43744388
#if defined(FEAT_SUN_WORKSHOP) || defined(FEAT_NETBEANS_INTG)
43754389
if (curbuf->b_ffname != NULL)

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -771,6 +771,8 @@ static char *(features[]) =
771771

772772
static int included_patches[] =
773773
{ /* Add new patch number below this line */
774+
/**/
775+
1461,
774776
/**/
775777
1460,
776778
/**/

0 commit comments

Comments
 (0)