Skip to content

Commit

Permalink
updated for version 7.3.563
Browse files Browse the repository at this point in the history
Problem:    Can't build with tiny features.
Solution:   Add #ifdef.
  • Loading branch information
brammool committed Jun 20, 2012
1 parent 38bdbd6 commit 50a12b4
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
14 changes: 10 additions & 4 deletions src/buffer.c
Expand Up @@ -1363,7 +1363,9 @@ set_curbuf(buf, action)
int action;
{
buf_T *prevbuf;
#ifdef FEAT_WINDOWS
win_T *prevwin;
#endif
int unload = (action == DOBUF_UNLOAD || action == DOBUF_DEL
|| action == DOBUF_WIPE);

Expand Down Expand Up @@ -1403,29 +1405,33 @@ set_curbuf(buf, action)
if (buf_valid(prevbuf))
#endif
{
#ifdef FEAT_WINDOWS
prevwin = curwin;
#endif
if (prevbuf == curbuf)
u_sync(FALSE);
close_buffer(prevbuf == curwin->w_buffer ? curwin : NULL, prevbuf,
unload ? action : (action == DOBUF_GOTO
&& !P_HID(prevbuf)
&& !bufIsChanged(prevbuf)) ? DOBUF_UNLOAD : 0, FALSE);
#ifdef FEAT_WINDOWS
if (curwin != prevwin && win_valid(prevwin))
/* autocommands changed curwin, Grr! */
curwin = prevwin;
#endif
}
}
#ifdef FEAT_AUTOCMD
/* An autocommand may have deleted "buf", already entered it (e.g., when
* it did ":bunload") or aborted the script processing!
* If curwin->w_buffer is null, enter_buffer() will make it valid again */
if ((buf_valid(buf) && buf != curbuf
#ifdef FEAT_EVAL
# ifdef FEAT_EVAL
&& !aborting()
#endif
#ifdef FEAT_WINDOWS
# endif
# ifdef FEAT_WINDOWS
) || curwin->w_buffer == NULL
#endif
# endif
)
#endif
enter_buffer(buf);
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -714,6 +714,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
563,
/**/
562,
/**/
Expand Down

0 comments on commit 50a12b4

Please sign in to comment.