diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-04-27 23:16:54 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-04-27 23:16:54 -0400 |
| commit | 860a0194a4bf699afbf07e85ddeac72a946cf23f (patch) | |
| tree | 5ac157fdb880b4886e4a4915441b1f792a8456c2 /src | |
| parent | ef4c0070cee64ab18529e76d87b4f20f3d6dabfe (diff) | |
| parent | c0de12c3c5f8a19172b4faeda89d01003ae03a71 (diff) | |
| download | rneovim-860a0194a4bf699afbf07e85ddeac72a946cf23f.tar.gz rneovim-860a0194a4bf699afbf07e85ddeac72a946cf23f.tar.bz2 rneovim-860a0194a4bf699afbf07e85ddeac72a946cf23f.zip | |
Merge pull request #4661 from brcolow/vim-7.4.1401
vim-patch: 7.4.1401
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/buffer.c | 11 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index 529d0889bd..6ed5b3136f 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -1294,14 +1294,15 @@ void enter_buffer(buf_T *buf) redraw_later(NOT_VALID); } -/* - * 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 do_autochdir(void) { if (p_acd) { - if (curbuf->b_ffname != NULL && vim_chdirfile(curbuf->b_ffname) == OK) { - shorten_fnames(TRUE); + if (starting == 0 + && curbuf->b_ffname != NULL + && vim_chdirfile(curbuf->b_ffname) == OK) { + shorten_fnames(true); } } } diff --git a/src/nvim/version.c b/src/nvim/version.c index 1714661049..b9e97f205e 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -277,7 +277,7 @@ static int included_patches[] = { // 1404 NA // 1403 NA // 1402 NA - // 1401, + 1401, // 1400 NA // 1399 NA // 1398 NA |