Patch 8.2.0809

[Bram Moolenaar]

Patch 8.2.0809
Problem: Build failure with small features. (Tony Mechelynck)
Solution: Move "expr" inside #ifdef.
Files: src/map.c


*** ../vim-8.2.0808/src/map.c 2020-05-22 13:09:55.320226061 +0200
--- src/map.c 2020-05-22 13:37:20.370688926 +0200
***************
*** 211,223 ****
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
scid_T sid, // -1 to use current_sctx
linenr_T lnum,
#endif
--- 211,223 ----
char_u *keys,
char_u *rhs,
char_u *orig_rhs,
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,849 ****
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,
#ifdef FEAT_EVAL
! /* sid */ -1, /* lnum */ 0,
#endif
did_simplify && keyround == 1) == FAIL)
{
--- 839,848 ----
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,
! noremap, nowait, silent, mode, abbrev,
#ifdef FEAT_EVAL
! expr, /* sid */ -1, /* lnum */ 0,
#endif
did_simplify && keyround == 1) == FAIL)
{
***************
*** 2331,2338 ****

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);
vim_free(keys_buf);
}
#endif
--- 2330,2337 ----

keys = replace_termcodes(lhs, &keys_buf,
REPTERM_FROM_PART | REPTERM_DO_LT, NULL);
! (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
*** ../vim-8.2.0808/src/version.c 2020-05-22 13:33:58.207383937 +0200
--- src/version.c 2020-05-22 13:37:56.282565144 +0200
***************
*** 748,749 ****
--- 748,751 ----
{ /* Add new patch number below this line */
+ /**/
+ 809,
/**/

--
hundred-and-one symptoms of being an internet addict:
157. You fum through a magazine, you first check to see if it has a web
address.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///