patch 8.1.1569: cannot build with signs but without diff feature

Problem:    Cannot build with signs but without diff feature.
Solution:   Move #ifdef. (Tom Ryder)

diff --git a/src/screen.c b/src/screen.c
index 016355e5d826cde39dd03a4a7cbefd8332d11f6c..914bf37c3aeab0bccdd2f5e746ce54759fe22cee 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -3051,8 +3051,8 @@ get_sign_display_info(
        int             wcr_attr,
        int             row,
        int             startrow,
-       int             filler_lines,
-       int             filler_todo,
+       int             filler_lines UNUSED,
+       int             filler_todo UNUSED,
        int             *c_extrap,
        int             *c_finalp,
        char_u          *extra,
@@ -3237,9 +3237,9 @@ win_line(
     int                mb_c = 0;               /* decoded multi-byte character */
     int                mb_utf8 = FALSE;        /* screen char is UTF-8 char */
     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
-    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 */
     int                change_start = MAXCOL;  /* first col of changed area */
     int                change_end = -1;        /* last col of changed area */

diff --git a/src/version.c b/src/version.c
index 68704cc3707510a4f76dd71c43afaf4677389469..7e97f9147bdafa30d431999b3bc57f5282dd9698 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -777,6 +777,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1569,
 /**/
     1568,
 /**/