diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-01-28 22:58:16 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-01-28 22:58:16 +0100 |
| commit | d21d9a6c6141be8b9c35f2ffede29cc0a6a91de8 (patch) | |
| tree | a6152a75b6f56dbcacaf4ff1f2412041d0bd2322 | |
| parent | c5d5d01ad9e3003f88a1c9aff0f4277c5f6c600e (diff) | |
updated for version 7.2.351v7.2.351
Problem: Can't build with some compilers.
Solution: Move the #ifdef outside of a macro. Cleanup the code.
| -rw-r--r-- | src/getchar.c | 25 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 18 insertions, 9 deletions
diff --git a/src/getchar.c b/src/getchar.c index 99f7ddb0df..d28eef5f07 100644 --- a/src/getchar.c +++ b/src/getchar.c @@ -2492,17 +2492,24 @@ vgetorpeek(advance) i = FAIL; else { - i = ins_typebuf(s, - save_m_noremap != REMAP_YES - ? save_m_noremap - : STRNCMP(s, + int noremap; + + if (save_m_noremap != REMAP_YES) + noremap = save_m_noremap; + else if ( #ifdef FEAT_EVAL - save_m_keys != NULL ? save_m_keys : + STRNCMP(s, save_m_keys != NULL + ? save_m_keys : mp->m_keys, + (size_t)keylen) +#else + STRNCMP(s, mp->m_keys, (size_t)keylen) #endif - mp->m_keys, - (size_t)keylen) != 0 - ? REMAP_YES : REMAP_SKIP, - 0, TRUE, cmd_silent || save_m_silent); + != 0) + noremap = REMAP_YES; + else + noremap = REMAP_SKIP; + i = ins_typebuf(s, noremap, + 0, TRUE, cmd_silent || save_m_silent); #ifdef FEAT_EVAL if (save_m_expr) vim_free(s); diff --git a/src/version.c b/src/version.c index 7e39961af1..a2bc904d15 100644 --- a/src/version.c +++ b/src/version.c @@ -682,6 +682,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 351, +/**/ 350, /**/ 349, |