patch 7.4.1615

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

diff --git a/src/normal.c b/src/normal.c
index 6af6296c9b9e92e53151eeb89d0b7f6520e4213e..f9a0124e206af3d4ec72475699e1c0e4b15329e1 100644 (file)
--- a/src/normal.c
+++ b/src/normal.c
@@ -2780,7 +2780,9 @@ do_mouse(
                        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 @@ do_mouse(
        }
 #endif
     }
+#ifdef FEAT_WINDOWS
     else if (in_sep_line)
     {
 # ifdef FEAT_MOUSESHAPE
@@ -3026,6 +3029,7 @@ do_mouse(
        }
 # endif
     }
+#endif
     else if ((mod_mask & MOD_MASK_MULTI_CLICK) && (State & (NORMAL | INSERT))
             && mouse_has(MOUSE_VISUAL))
     {

diff --git a/src/version.c b/src/version.c
index e7db1e53520f8e36bb3cb3f60b7aadf82aa35f11..2dbc1764c7d1155880ea77f59e713bb16727d1ae 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1615,
 /**/
     1614,
 /**/

diff --git a/src/window.c b/src/window.c
index d590c57ed421847c205f2e40b8ed3f4c697310cf..9530ef5020effe25290f02cf6aea3a22ad589c7b 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -3446,7 +3446,9 @@ win_alloc_firstwin(win_T *oldwin)
     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 @@ win_init_size(void)
 {
     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 @@ win_alloc(win_T *after UNUSED, int hidden UNUSED)
 #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;