summaryrefslogtreecommitdiff
path: root/src/buffer.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-06-20 17:54:38 +0200
committerBram Moolenaar <Bram@vim.org>2012-06-20 17:54:38 +0200
commit50a12b40783550fb8fd7a6283815b107863292ab (patch)
tree3ba80438100aa0bdaeb48149901ca69ae7245ca8 /src/buffer.c
parent38bdbd6c6f39e5bffad22ec956fa1383e04fa1ae (diff)
downloadvim-git-50a12b40783550fb8fd7a6283815b107863292ab.tar.gz
updated for version 7.3.563v7.3.563
Problem: Can't build with tiny features. Solution: Add #ifdef.
Diffstat (limited to 'src/buffer.c')
-rw-r--r--src/buffer.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/buffer.c b/src/buffer.c
index 183429159..c84e6d585 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -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);
@@ -1403,16 +1405,20 @@ 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
@@ -1420,12 +1426,12 @@ set_curbuf(buf, action)
* 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);