Mercurial > vim

changeset 2066:2bd96108392e v7.2.351

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.2.351 Problem: Can't build with some compilers. Solution: Move the #ifdef outside of a macro. Cleanup the code.
author Bram Moolenaar <bram@zimbu.org>
date Thu, 28 Jan 2010 22:58:16 +0100
parents 9b78bb3794ba
children 8e2d14a3e7d2
files src/getchar.c src/version.c
diffstat 2 files changed, 18 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- 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);
--- 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,