IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4661 from brcolow/vim-7.4.1401

Browse Source 
vim-patch: 7.4.1401
This commit is contained in:
Justin M. Keyes 2016-04-27 23:16:54 -04:00
commit 860a0194a4
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/nvim/buffer.c
View File

@ -1294,14 +1294,15 @@ void enter_buffer(buf_T *buf)
redraw_later(NOT_VALID); 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) void do_autochdir(void)
{ {
if (p_acd) { if (p_acd) {
if (curbuf->b_ffname != NULL && vim_chdirfile(curbuf->b_ffname) == OK) { if (starting == 0
shorten_fnames(TRUE); && curbuf->b_ffname != NULL
&& vim_chdirfile(curbuf->b_ffname) == OK) {
shorten_fnames(true);
} }
} }
} }

2
src/nvim/version.c
View File

@ -277,7 +277,7 @@ static int included_patches[] = {
// 1404 NA // 1404 NA
// 1403 NA // 1403 NA
// 1402 NA // 1402 NA
// 1401, 1401,
// 1400 NA // 1400 NA
// 1399 NA // 1399 NA
// 1398 NA // 1398 NA