commit 829c8e369630a7cbbdac015d8177b7fde25e2f19
author Bram Moolenaar <Bram@vim.org> Sat Mar 19 23:07:23 2016 +0100
committer Bram Moolenaar <Bram@vim.org> Sat Mar 19 23:07:23 2016 +0100
tree 16863d92e1d909bec874249063bce9cd07fde657
parent 7eba3d2cbf19e731dc51652bc26099cc253d538a

patch 7.4.1615
Problem:    Build fails with tiny features.
Solution:   Adjust #ifdefs.

src/normal.c

diff --git a/src/normal.c b/src/normal.c
index 6af6296..f9a0124 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -2780,7 +2780,9 @@
 			oap == NULL ? NULL : &(oap->inclusive), which_button);
     moved = (jump_flags & CURSOR_MOVED);
     in_status_line = (jump_flags & IN_STATUS_LINE);
+#ifdef FEAT_WINDOWS
     in_sep_line = (jump_flags & IN_SEP_LINE);
+#endif
 
 #ifdef FEAT_NETBEANS_INTG
     if (isNetbeansBuffer(curbuf)
@@ -3016,6 +3018,7 @@
 	}
 #endif
     }
+#ifdef FEAT_WINDOWS
     else if (in_sep_line)
     {
 # ifdef FEAT_MOUSESHAPE
@@ -3026,6 +3029,7 @@
 	}
 # endif
     }
+#endif
     else if ((mod_mask & MOD_MASK_MULTI_CLICK) && (State & (NORMAL | INSERT))
 	     && mouse_has(MOUSE_VISUAL))
     {

src/version.c

diff --git a/src/version.c b/src/version.c
index e7db1e5..2dbc176 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1615,
+/**/
     1614,
 /**/
     1613,

src/window.c

diff --git a/src/window.c b/src/window.c
index d590c57..9530ef5 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3446,7 +3446,9 @@
     if (curwin->w_frame == NULL)
 	return FAIL;
     topframe = curwin->w_frame;
+#ifdef FEAT_WINDOWS
     topframe->fr_width = Columns;
+#endif
     topframe->fr_height = Rows - p_ch;
     topframe->fr_win = curwin;
 
@@ -3477,8 +3479,10 @@
 {
     firstwin->w_height = ROWS_AVAIL;
     topframe->fr_height = ROWS_AVAIL;
+#ifdef FEAT_WINDOWS
     firstwin->w_width = Columns;
     topframe->fr_width = Columns;
+#endif
 }
 
 #if defined(FEAT_WINDOWS) || defined(PROTO)
@@ -4468,9 +4472,9 @@
 #ifdef FEAT_WINDOWS
     if (!hidden)
 	win_append(after, new_wp);
-#endif
     new_wp->w_wincol = 0;
     new_wp->w_width = Columns;
+#endif
 
     /* position the display and the cursor at the top of the file. */
     new_wp->w_topline = 1;