From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 24 Dec 2009 14:46:12 +0000 (+0000)
Subject: updated for version 7.2-322
X-Git-Tag: v7.2.322
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30848947930e16759289db7489f7a6a20897f6e1;p=thirdparty%2Fvim.git

updated for version 7.2-322
---

diff --git a/src/edit.c b/src/edit.c
index 19e5b8d5ec..75b18084f3 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -7397,6 +7397,10 @@ in_cinkeys(keytyped, when, line_is_empty)
     int		icase;
     int		i;
 
+    if (keytyped == NUL)
+	/* Can happen with CTRL-Y and CTRL-E on a short line. */
+	return FALSE;
+
 #ifdef FEAT_EVAL
     if (*curbuf->b_p_inde != NUL)
 	look = curbuf->b_p_indk;	/* 'indentexpr' set: use 'indentkeys' */
diff --git a/src/version.c b/src/version.c
index 2798658436..9523db5e69 100644
--- 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 */
+/**/
+    322,
 /**/
     321,
 /**/