0
0
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00

patch 7.4.1401

Problem:    Having 'autochdir' set during startup and using diff mode doesn't
            work. (Axel Bender)
Solution:   Don't use 'autochdir' while still starting up. (Christian
            Brabandt)
This commit is contained in:
Bram Moolenaar
2016-02-23 16:19:07 +01:00
parent 254ebaf068
commit 6bd364e084
2 changed files with 6 additions and 1 deletions

View File

@@ -1615,11 +1615,14 @@ enter_buffer(buf_T *buf)
#if defined(FEAT_AUTOCHDIR) || defined(PROTO) #if defined(FEAT_AUTOCHDIR) || defined(PROTO)
/* /*
* Change to the directory of the current buffer. * Change to the directory of the current buffer.
* Don't do this while still starting up.
*/ */
void void
do_autochdir(void) do_autochdir(void)
{ {
if (curbuf->b_ffname != NULL && vim_chdirfile(curbuf->b_ffname) == OK) if (starting == 0
&& curbuf->b_ffname != NULL
&& vim_chdirfile(curbuf->b_ffname) == OK)
shorten_fnames(TRUE); shorten_fnames(TRUE);
} }
#endif #endif

View File

@@ -748,6 +748,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1401,
/**/ /**/
1400, 1400,
/**/ /**/