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

updated for version 7.3.563

Browse Source 
Problem:    Can't build with tiny features.
Solution:   Add #ifdef.
This commit is contained in:
Bram Moolenaar
2012-06-20 17:54:38 +02:00
parent 38bdbd6c6f
commit 50a12b4078
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/buffer.c
View File

@@ -1363,7 +1363,9 @@ set_curbuf(buf, action)
int action; int action;
{ {
buf_T *prevbuf; buf_T *prevbuf;
#ifdef FEAT_WINDOWS
win_T *prevwin; win_T *prevwin;
#endif
int unload = (action == DOBUF_UNLOAD || action == DOBUF_DEL int unload = (action == DOBUF_UNLOAD || action == DOBUF_DEL
|| action == DOBUF_WIPE); || action == DOBUF_WIPE);
@@ -1403,16 +1405,20 @@ set_curbuf(buf, action)
if (buf_valid(prevbuf)) if (buf_valid(prevbuf))
#endif #endif
{ {
#ifdef FEAT_WINDOWS
prevwin = curwin; prevwin = curwin;
#endif
if (prevbuf == curbuf) if (prevbuf == curbuf)
u_sync(FALSE); u_sync(FALSE);
close_buffer(prevbuf == curwin->w_buffer ? curwin : NULL, prevbuf, close_buffer(prevbuf == curwin->w_buffer ? curwin : NULL, prevbuf,
unload ? action : (action == DOBUF_GOTO unload ? action : (action == DOBUF_GOTO
&& !P_HID(prevbuf) && !P_HID(prevbuf)
&& !bufIsChanged(prevbuf)) ? DOBUF_UNLOAD : 0, FALSE); && !bufIsChanged(prevbuf)) ? DOBUF_UNLOAD : 0, FALSE);
#ifdef FEAT_WINDOWS
if (curwin != prevwin && win_valid(prevwin)) if (curwin != prevwin && win_valid(prevwin))
/* autocommands changed curwin, Grr! */ /* autocommands changed curwin, Grr! */
curwin = prevwin; curwin = prevwin;
#endif
} }
} }
#ifdef FEAT_AUTOCMD #ifdef FEAT_AUTOCMD
@@ -1420,12 +1426,12 @@ set_curbuf(buf, action)
* it did ":bunload") or aborted the script processing! * it did ":bunload") or aborted the script processing!
* If curwin->w_buffer is null, enter_buffer() will make it valid again */ * If curwin->w_buffer is null, enter_buffer() will make it valid again */
if ((buf_valid(buf) && buf != curbuf if ((buf_valid(buf) && buf != curbuf
#ifdef FEAT_EVAL # ifdef FEAT_EVAL
&& !aborting() && !aborting()
#endif # endif
#ifdef FEAT_WINDOWS # ifdef FEAT_WINDOWS
) || curwin->w_buffer == NULL ) || curwin->w_buffer == NULL
#endif # endif
) )
#endif #endif
enter_buffer(buf); enter_buffer(buf);

2
src/version.c
View File

@@ -714,6 +714,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 */
/**/
563,
/**/ /**/
562, 562,
/**/ /**/