thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.1615

Browse Source 
Problem:    Build fails with tiny features.
Solution:   Adjust #ifdefs.
This commit is contained in:
Bram Moolenaar
2016-03-19 23:07:23 +01:00
parent 7eba3d2cbf
commit 829c8e3696
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/normal.c
View File

@@ -2780,7 +2780,9 @@ do_mouse(
oap == NULL ? NULL : &(oap->inclusive), which_button); oap == NULL ? NULL : &(oap->inclusive), which_button);
moved = (jump_flags & CURSOR_MOVED); moved = (jump_flags & CURSOR_MOVED);
in_status_line = (jump_flags & IN_STATUS_LINE); in_status_line = (jump_flags & IN_STATUS_LINE);
#ifdef FEAT_WINDOWS
in_sep_line = (jump_flags & IN_SEP_LINE); in_sep_line = (jump_flags & IN_SEP_LINE);
#endif
#ifdef FEAT_NETBEANS_INTG #ifdef FEAT_NETBEANS_INTG
if (isNetbeansBuffer(curbuf) if (isNetbeansBuffer(curbuf)
@@ -3016,6 +3018,7 @@ do_mouse(
} }
#endif #endif
} }
#ifdef FEAT_WINDOWS
else if (in_sep_line) else if (in_sep_line)
{ {
# ifdef FEAT_MOUSESHAPE # ifdef FEAT_MOUSESHAPE
@@ -3026,6 +3029,7 @@ do_mouse(
} }
# endif # endif
} }
#endif
else if ((mod_mask & MOD_MASK_MULTI_CLICK) && (State & (NORMAL | INSERT)) else if ((mod_mask & MOD_MASK_MULTI_CLICK) && (State & (NORMAL | INSERT))
&& mouse_has(MOUSE_VISUAL)) && mouse_has(MOUSE_VISUAL))
{ {

2
src/version.c
View File

@@ -748,6 +748,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1615,
/**/ /**/
1614, 1614,
/**/ /**/

6
src/window.c
View File

@@ -3446,7 +3446,9 @@ win_alloc_firstwin(win_T *oldwin)
if (curwin->w_frame == NULL) if (curwin->w_frame == NULL)
return FAIL; return FAIL;
topframe = curwin->w_frame; topframe = curwin->w_frame;
#ifdef FEAT_WINDOWS
topframe->fr_width = Columns; topframe->fr_width = Columns;
#endif
topframe->fr_height = Rows - p_ch; topframe->fr_height = Rows - p_ch;
topframe->fr_win = curwin; topframe->fr_win = curwin;
@@ -3477,8 +3479,10 @@ win_init_size(void)
{ {
firstwin->w_height = ROWS_AVAIL; firstwin->w_height = ROWS_AVAIL;
topframe->fr_height = ROWS_AVAIL; topframe->fr_height = ROWS_AVAIL;
#ifdef FEAT_WINDOWS
firstwin->w_width = Columns; firstwin->w_width = Columns;
topframe->fr_width = Columns; topframe->fr_width = Columns;
#endif
} }
#if defined(FEAT_WINDOWS) || defined(PROTO) #if defined(FEAT_WINDOWS) || defined(PROTO)
@@ -4468,9 +4472,9 @@ win_alloc(win_T *after UNUSED, int hidden UNUSED)
#ifdef FEAT_WINDOWS #ifdef FEAT_WINDOWS
if (!hidden) if (!hidden)
win_append(after, new_wp); win_append(after, new_wp);
#endif
new_wp->w_wincol = 0; new_wp->w_wincol = 0;
new_wp->w_width = Columns; new_wp->w_width = Columns;
#endif
/* position the display and the cursor at the top of the file. */ /* position the display and the cursor at the top of the file. */
new_wp->w_topline = 1; new_wp->w_topline = 1;