vim-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)

6bd364e084
This commit is contained in:
Michael Ennen
2016-04-27 15:18:42 -07:00
parent e861af85f8
commit c0de12c3c5
2 changed files with 7 additions and 6 deletions

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);
} }
} }
} }

View File

@@ -276,7 +276,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