updated for version 7.2-322

diff --git a/src/edit.c b/src/edit.c
index 19e5b8d5ec0e5069070b4db70a7e8de3e07ee504..75b18084f3b23bbc9a6a9a2eb355bb4e6f3e64c3 100644 (file)
--- 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 2798658436d554e1d8a815df0c256c474e651cc7..9523db5e69f6d3374e4ffabe679cf85a07c534df 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 */
+/**/
+    322,
 /**/
     321,
 /**/