Mercurial > vim

comparison src/map.c @ 20510:3d9a2c8d4f95 v8.2.0809

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.0809: build failure with small features Commit: https://github.com/vim/vim/commit/5a80f8ad5dc0b2cc63400255dcf3c63f6c1a2ef9 Author: Bram Moolenaar <Bram@vim.org> Date: Fri May 22 13:38:18 2020 +0200 patch 8.2.0809: build failure with small features Problem: Build failure with small features. (Tony Mechelynck) Solution: Move "expr" inside #ifdef.
author Bram Moolenaar <Bram@vim.org>
date Fri, 22 May 2020 13:45:04 +0200
parents aee0b72ca6d6
children d9e3fdf26cb9
comparison
equal deleted inserted replaced
20509:5acf0e9d9019 20510:3d9a2c8d4f95
209 mapblock_T **map_table, 209 mapblock_T **map_table,
210 mapblock_T **abbr_table, 210 mapblock_T **abbr_table,
211 char_u *keys, 211 char_u *keys,
212 char_u *rhs, 212 char_u *rhs,
213 char_u *orig_rhs, 213 char_u *orig_rhs,
214 int expr,
215 int noremap, 214 int noremap,
216 int nowait, 215 int nowait,
217 int silent, 216 int silent,
218 int mode, 217 int mode,
219 int is_abbr, 218 int is_abbr,
220 #ifdef FEAT_EVAL 219 #ifdef FEAT_EVAL
220 int expr,
221 scid_T sid, // -1 to use current_sctx 221 scid_T sid, // -1 to use current_sctx
222 linenr_T lnum, 222 linenr_T lnum,
223 #endif 223 #endif
224 int simplified) 224 int simplified)
225 { 225 {
837 837
838 if (did_it) 838 if (did_it)
839 continue; // have added the new entry already 839 continue; // have added the new entry already
840 840
841 // Get here when adding a new entry to the maphash[] list or abbrlist. 841 // Get here when adding a new entry to the maphash[] list or abbrlist.
842 if (map_add(map_table, abbr_table, keys, rhs, orig_rhs, expr, 842 if (map_add(map_table, abbr_table, keys, rhs, orig_rhs,
843 noremap, nowait, silent, mode, 843 noremap, nowait, silent, mode, abbrev,
844 abbrev,
845 #ifdef FEAT_EVAL 844 #ifdef FEAT_EVAL
846 /* sid */ -1, /* lnum */ 0, 845 expr, /* sid */ -1, /* lnum */ 0,
847 #endif 846 #endif
848 did_simplify && keyround == 1) == FAIL) 847 did_simplify && keyround == 1) == FAIL)
849 { 848 {
850 retval = 4; // no mem 849 retval = 4; // no mem
851 goto theend; 850 goto theend;
2329 do_map(1, arg, mode, is_abbr); 2328 do_map(1, arg, mode, is_abbr);
2330 vim_free(arg); 2329 vim_free(arg);
2331 2330
2332 keys = replace_termcodes(lhs, &keys_buf, 2331 keys = replace_termcodes(lhs, &keys_buf,
2333 REPTERM_FROM_PART | REPTERM_DO_LT, NULL); 2332 REPTERM_FROM_PART | REPTERM_DO_LT, NULL);
2334 (void)map_add(map_table, abbr_table, keys, rhs, rhs, expr, 2333 (void)map_add(map_table, abbr_table, keys, rhs, rhs, noremap,
2335 noremap, nowait, silent, mode, is_abbr, sid, lnum, simplified); 2334 nowait, silent, mode, is_abbr, expr, sid, lnum, simplified);
2336 vim_free(keys_buf); 2335 vim_free(keys_buf);
2337 } 2336 }
2338 #endif 2337 #endif
2339 2338
2340 2339