aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

patch 8.1.1569: cannot build with signs but without diff feature

Browse Source 
Problem:    Cannot build with signs but without diff feature.
Solution:   Move #ifdef. (Tom Ryder)
This commit is contained in:
Bram Moolenaar
2019-06-19 14:28:43 +02:00
parent 87652a7e3b
commit bf8c3adef2
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/screen.c
View File

@@ -3051,8 +3051,8 @@ get_sign_display_info(
int wcr_attr, int wcr_attr,
int row, int row,
int startrow, int startrow,
int filler_lines, int filler_lines UNUSED,
int filler_todo, int filler_todo UNUSED,
int *c_extrap, int *c_extrap,
int *c_finalp, int *c_finalp,
char_u *extra, char_u *extra,
@@ -3237,9 +3237,9 @@ win_line(
int mb_c = 0; /* decoded multi-byte character */ int mb_c = 0; /* decoded multi-byte character */
int mb_utf8 = FALSE; /* screen char is UTF-8 char */ int mb_utf8 = FALSE; /* screen char is UTF-8 char */
int u8cc[MAX_MCO]; /* composing UTF-8 chars */ int u8cc[MAX_MCO]; /* composing UTF-8 chars */
int filler_lines = 0; /* nr of filler lines to be drawn */
int filler_todo = 0; /* nr of filler lines still to do + 1 */
#ifdef FEAT_DIFF #ifdef FEAT_DIFF
int filler_lines; /* nr of filler lines to be drawn */
int filler_todo; /* nr of filler lines still to do + 1 */
hlf_T diff_hlf = (hlf_T)0; /* type of diff highlighting */ hlf_T diff_hlf = (hlf_T)0; /* type of diff highlighting */
int change_start = MAXCOL; /* first col of changed area */ int change_start = MAXCOL; /* first col of changed area */
int change_end = -1; /* last col of changed area */ int change_end = -1; /* last col of changed area */

2
src/version.c
View File

@@ -777,6 +777,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 */
/**/
1569,
/**/ /**/
1568, 1568,
/**/ /**/