diff options
| author | Bram Moolenaar <Bram@vim.org> | 2009-12-24 14:46:12 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2009-12-24 14:46:12 +0000 |
| commit | 30848947930e16759289db7489f7a6a20897f6e1 (patch) | |
| tree | 55677fea82af229ec636f778cd48745f79878a54 /src | |
| parent | c7be3f30d0a7002d4ec7dd71fb7ccfafd3fa2dde (diff) | |
| download | vim-git-30848947930e16759289db7489f7a6a20897f6e1.tar.gz | |
updated for version 7.2-322v7.2.322
Diffstat (limited to 'src')
| -rw-r--r-- | src/edit.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/edit.c b/src/edit.c index 19e5b8d5e..75b18084f 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 279865843..9523db5e6 100644 --- 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 */ /**/ + 322, +/**/ 321, /**/ 320, |