Mercurial > vim

changeset 6487:97b2ff29ae3a v7.4.571

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.4.571 Problem: Can't build with tiny features. (Ike Devolder) Solution: Add #ifdef.
author Bram Moolenaar <bram@vim.org>
date Wed, 14 Jan 2015 14:08:44 +0100
parents 927e305059e9
children 3a9ebf9c8d38
files src/getchar.c src/version.c
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -3710,9 +3710,11 @@ do_map(maptype, arg, mode, abbrev)
 	else if (*keys == Ctrl_C)
 	{
 	    /* If CTRL-C has been unmapped, reuse it for Interrupting. */
+#ifdef FEAT_LOCALMAP
 	    if (map_table == curbuf->b_maphash)
 		curbuf->b_mapped_ctrl_c &= ~mode;
 	    else
+#endif
 		mapped_ctrl_c &= ~mode;
 	}
 	goto theend;
@@ -3750,9 +3752,11 @@ do_map(maptype, arg, mode, abbrev)
     /* If CTRL-C has been mapped, don't always use it for Interrupting. */
     if (*keys == Ctrl_C)
     {
+#ifdef FEAT_LOCALMAP
 	if (map_table == curbuf->b_maphash)
 	    curbuf->b_mapped_ctrl_c |= mode;
 	else
+#endif
 	    mapped_ctrl_c |= mode;
     }
 
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    571,
+/**/
     570,
 /**/
     569,