patch 8.2.0809: build failure with small features

Problem:    Build failure with small features. (Tony Mechelynck)
Solution:   Move "expr" inside #ifdef.

diff --git a/src/map.c b/src/map.c
index 34a956e0be0bd5dbd94f47f1969c2492704c4340..6f926852d0686a8485f1d6f109ce8d9c0e2617be 100644 (file)
--- a/src/map.c
+++ b/src/map.c
@@ -211,13 +211,13 @@ map_add(
        char_u      *keys,
        char_u      *rhs,
        char_u      *orig_rhs,
-       int         expr,
        int         noremap,
        int         nowait,
        int         silent,
        int         mode,
        int         is_abbr,
 #ifdef FEAT_EVAL
+       int         expr,
        scid_T      sid,            // -1 to use current_sctx
        linenr_T    lnum,
 #endif
@@ -839,11 +839,10 @@ do_map(
            continue;   // have added the new entry already
 
        // Get here when adding a new entry to the maphash[] list or abbrlist.
-       if (map_add(map_table, abbr_table, keys, rhs, orig_rhs, expr,
-                   noremap, nowait, silent, mode,
-                   abbrev,
+       if (map_add(map_table, abbr_table, keys, rhs, orig_rhs,
+                   noremap, nowait, silent, mode, abbrev,
 #ifdef FEAT_EVAL
-                   /* sid */ -1, /* lnum */ 0,
+                   expr, /* sid */ -1, /* lnum */ 0,
 #endif
                    did_simplify && keyround == 1) == FAIL)
        {
@@ -2331,8 +2330,8 @@ f_mapset(typval_T *argvars, typval_T *rettv UNUSED)
 
     keys = replace_termcodes(lhs, &keys_buf,
                                      REPTERM_FROM_PART | REPTERM_DO_LT, NULL);
-    (void)map_add(map_table, abbr_table, keys, rhs, rhs, expr,
-               noremap, nowait, silent, mode, is_abbr, sid, lnum, simplified);
+    (void)map_add(map_table, abbr_table, keys, rhs, rhs, noremap,
+           nowait, silent, mode, is_abbr, expr, sid, lnum, simplified);
     vim_free(keys_buf);
 }
 #endif

diff --git a/src/version.c b/src/version.c
index ad904970ea7afbe6a745595597cdebfc8c2ca9a1..1ca9dee70b2d78e83ee1c58696854c36f4b7b488 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    809,
 /**/
     808,
 /**/