updated for version 7.2.351

Problem:    Can't build with some compilers.
Solution:   Move the #ifdef outside of a macro.  Cleanup the code.

diff --git a/src/getchar.c b/src/getchar.c
index 99f7ddb0dfaf7408b821dd59c5339ba975497d6b..d28eef5f079cfb2f079dc6bca742ce9f1aa1877e 100644 (file)
--- 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 7e39961af1f71a87daf0302a454648a83fb187a2..a2bc904d15608e6a6d18e2ad75d22fc2d1cd01db 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -681,6 +681,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    351,
 /**/
     350,
 /**/