diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-05-22 13:38:18 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-05-22 13:38:18 +0200 |
| commit | 5a80f8ad5dc0b2cc63400255dcf3c63f6c1a2ef9 (patch) | |
| tree | 11d89d43d32362b2b31b33f283425c65de9733be | |
| parent | 98f1671cc0ab0ad6139cb9c6ce5262e7f646bc0a (diff) | |
| download | vim-git-8.2.0809.tar.gz | |
patch 8.2.0809: build failure with small featuresv8.2.0809
Problem: Build failure with small features. (Tony Mechelynck)
Solution: Move "expr" inside #ifdef.
| -rw-r--r-- | src/map.c | 13 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 7 deletions
@@ -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 ad904970e..1ca9dee70 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 809, +/**/ 808, /**/ 807, |