Skip to content

Commit 829c8e3

Browse files
committed
patch 7.4.1615
Problem: Build fails with tiny features. Solution: Adjust #ifdefs.
1 parent 7eba3d2 commit 829c8e3

3 files changed

Lines changed: 11 additions & 1 deletion

File tree

src/normal.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2780,7 +2780,9 @@ do_mouse(
27802780
oap == NULL ? NULL : &(oap->inclusive), which_button);
27812781
moved = (jump_flags & CURSOR_MOVED);
27822782
in_status_line = (jump_flags & IN_STATUS_LINE);
2783+
#ifdef FEAT_WINDOWS
27832784
in_sep_line = (jump_flags & IN_SEP_LINE);
2785+
#endif
27842786

27852787
#ifdef FEAT_NETBEANS_INTG
27862788
if (isNetbeansBuffer(curbuf)
@@ -3016,6 +3018,7 @@ do_mouse(
30163018
}
30173019
#endif
30183020
}
3021+
#ifdef FEAT_WINDOWS
30193022
else if (in_sep_line)
30203023
{
30213024
# ifdef FEAT_MOUSESHAPE
@@ -3026,6 +3029,7 @@ do_mouse(
30263029
}
30273030
# endif
30283031
}
3032+
#endif
30293033
else if ((mod_mask & MOD_MASK_MULTI_CLICK) && (State & (NORMAL | INSERT))
30303034
&& mouse_has(MOUSE_VISUAL))
30313035
{

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -748,6 +748,8 @@ static char *(features[]) =
748748

749749
static int included_patches[] =
750750
{ /* Add new patch number below this line */
751+
/**/
752+
1615,
751753
/**/
752754
1614,
753755
/**/

src/window.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3446,7 +3446,9 @@ win_alloc_firstwin(win_T *oldwin)
34463446
if (curwin->w_frame == NULL)
34473447
return FAIL;
34483448
topframe = curwin->w_frame;
3449+
#ifdef FEAT_WINDOWS
34493450
topframe->fr_width = Columns;
3451+
#endif
34503452
topframe->fr_height = Rows - p_ch;
34513453
topframe->fr_win = curwin;
34523454

@@ -3477,8 +3479,10 @@ win_init_size(void)
34773479
{
34783480
firstwin->w_height = ROWS_AVAIL;
34793481
topframe->fr_height = ROWS_AVAIL;
3482+
#ifdef FEAT_WINDOWS
34803483
firstwin->w_width = Columns;
34813484
topframe->fr_width = Columns;
3485+
#endif
34823486
}
34833487

34843488
#if defined(FEAT_WINDOWS) || defined(PROTO)
@@ -4468,9 +4472,9 @@ win_alloc(win_T *after UNUSED, int hidden UNUSED)
44684472
#ifdef FEAT_WINDOWS
44694473
if (!hidden)
44704474
win_append(after, new_wp);
4471-
#endif
44724475
new_wp->w_wincol = 0;
44734476
new_wp->w_width = Columns;
4477+
#endif
44744478

44754479
/* position the display and the cursor at the top of the file. */
44764480
new_wp->w_topline = 1;

0 commit comments

Comments
 (0)