aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/buffer.c
diff options
context:
space:
mode:
authorHinidu <hinidu@gmail.com>2014-04-08 23:52:28 +0300
committerJustin M. Keyes <justinkz@gmail.com>2014-05-28 13:08:53 -0400
commitdd7657c1605246e8f7ade35184069a09dc254e84 (patch)
treeed644fb940453182556c9ccde856d1a5e472edd2 /src/nvim/buffer.c
parent3dddceedceebb73b93d399f2c56b0f1b5394c645 (diff)
downloadrneovim-dd7657c1605246e8f7ade35184069a09dc254e84.tar.gz
rneovim-dd7657c1605246e8f7ade35184069a09dc254e84.tar.bz2
rneovim-dd7657c1605246e8f7ade35184069a09dc254e84.zip
Removed FEAT_WINDOWS
Support for multiple windows and status line.
Diffstat (limited to 'src/nvim/buffer.c')
-rw-r--r--src/nvim/buffer.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 946053140d..5942f51df4 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -601,14 +601,12 @@ static void clear_wininfo(buf_T *buf)
*/
void goto_buffer(exarg_T *eap, int start, int dir, int count)
{
-# if defined(FEAT_WINDOWS) && defined(HAS_SWAP_EXISTS_ACTION)
- buf_T *old_curbuf = curbuf;
-
- swap_exists_action = SEA_DIALOG;
-# endif
(void)do_buffer(*eap->cmd == 's' ? DOBUF_SPLIT : DOBUF_GOTO,
start, dir, count, eap->forceit);
-# if defined(FEAT_WINDOWS) && defined(HAS_SWAP_EXISTS_ACTION)
+#ifdef HAS_SWAP_EXISTS_ACTION
+ buf_T *old_curbuf = curbuf;
+ swap_exists_action = SEA_DIALOG;
+
if (swap_exists_action == SEA_QUIT && *eap->cmd == 's') {
cleanup_T cs;
@@ -624,9 +622,10 @@ void goto_buffer(exarg_T *eap, int start, int dir, int count)
/* Restore the error/interrupt/exception state if not discarded by a
* new aborting error, interrupt, or uncaught exception. */
leave_cleanup(&cs);
- } else
+ } else {
handle_swap_exists(old_curbuf);
-# endif
+ }
+#endif
}
#if defined(HAS_SWAP_EXISTS_ACTION) || defined(PROTO)