From dd7657c1605246e8f7ade35184069a09dc254e84 Mon Sep 17 00:00:00 2001
From: Hinidu <hinidu@gmail.com>
Date: Tue, 8 Apr 2014 23:52:28 +0300
Subject: Removed FEAT_WINDOWS

Support for multiple windows and status line.
---
 src/nvim/buffer.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/nvim/buffer.c')

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


From 9d6c5de4f1cf92a3e145a7c76529f8f80bb24551 Mon Sep 17 00:00:00 2001
From: Hinidu <hinidu@gmail.com>
Date: Fri, 11 Apr 2014 23:29:16 +0300
Subject: Remove FEAT_CMDL_INFO

'showcmd' and 'ruler' options
---
 src/nvim/buffer.c | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/nvim/buffer.c')

diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 5942f51df4..ee606d9e80 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -3510,8 +3510,6 @@ build_stl_str_hl (
   return width;
 }
 
-#if defined(FEAT_STL_OPT) || defined(FEAT_CMDL_INFO) \
-  || defined(FEAT_GUI_TABLINE) || defined(PROTO)
 /*
  * Get relative cursor position in window into "buf[buflen]", in the form 99%,
  * using "Top", "Bot" or "All" when appropriate.
@@ -3534,7 +3532,6 @@ void get_rel_pos(win_T *wp, char_u *buf, int buflen)
         ? (int)(above / ((above + below) / 100L))
         : (int)(above * 100L / (above + below)));
 }
-#endif
 
 /*
  * Append (file 2 of 8) to "buf[buflen]", if editing more than one file.
-- 
cgit 


From 5f2ccb94d2103969aabed9e57f1a0b0b691a3356 Mon Sep 17 00:00:00 2001
From: Hinidu <hinidu@gmail.com>
Date: Fri, 11 Apr 2014 23:45:48 +0300
Subject: Remove FEAT_CURSORBIND

Synchronization of cursor in split windows for diff mode
---
 src/nvim/buffer.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/nvim/buffer.c')

diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index ee606d9e80..2f5ae416b3 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -1111,8 +1111,7 @@ do_buffer (
   /* Go to the other buffer. */
   set_curbuf(buf, action);
 
-#if defined(FEAT_LISTCMDS) \
-  && (defined(FEAT_SCROLLBIND) || defined(FEAT_CURSORBIND))
+#ifdef FEAT_LISTCMDS
   if (action == DOBUF_SPLIT) {
     RESET_BINDING(curwin);      /* reset 'scrollbind' and 'cursorbind' */
   }
-- 
cgit 


From 50429aee6edf6f2bfd2d74911179445ee66282a2 Mon Sep 17 00:00:00 2001
From: Hinidu <hinidu@gmail.com>
Date: Sat, 12 Apr 2014 00:05:36 +0300
Subject: Remove FEAT_LISTCMDS

Vim commands for the buffer list and the argument list: ":buffer",
":bnext", ":bdel", ":argdelete", etc.
---
 src/nvim/buffer.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/nvim/buffer.c')

diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 2f5ae416b3..d3dcb375b2 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -1111,11 +1111,9 @@ do_buffer (
   /* Go to the other buffer. */
   set_curbuf(buf, action);
 
-#ifdef FEAT_LISTCMDS
   if (action == DOBUF_SPLIT) {
     RESET_BINDING(curwin);      /* reset 'scrollbind' and 'cursorbind' */
   }
-#endif
 
   if (aborting())           /* autocmds may abort script processing */
     return FAIL;
-- 
cgit