diff options
author | Bram Moolenaar <Bram@vim.org> | 2008-01-22 16:50:03 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2008-01-22 16:50:03 +0000 |
commit | d4e20a781320576a77c44865599c8d77e61d1fc0 (patch) | |
tree | 0b33e37b9e635119d54f23859a91184eac3114ef /src | |
parent | b44df0af832b4f8817386d56c7b919445c407a81 (diff) | |
download | vim-git-d4e20a781320576a77c44865599c8d77e61d1fc0.tar.gz |
updated for version 7.1-241v7.1.241
Diffstat (limited to 'src')
-rw-r--r-- | src/edit.c | 25 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 17 insertions, 10 deletions
diff --git a/src/edit.c b/src/edit.c index 4ce11d182..6a2f9518d 100644 --- a/src/edit.c +++ b/src/edit.c @@ -703,10 +703,13 @@ edit(cmdchar, startln, count) #endif /* - * Get a character for Insert mode. + * Get a character for Insert mode. Ignore K_IGNORE. */ lastc = c; /* remember previous char for CTRL-D */ - c = safe_vgetc(); + do + { + c = safe_vgetc(); + } while (c == K_IGNORE); #ifdef FEAT_AUTOCMD /* Don't want K_CURSORHOLD for the second key, e.g., after CTRL-V. */ @@ -777,7 +780,7 @@ edit(cmdchar, startln, count) /* Prepare for or stop CTRL-X mode. This doesn't do completion, but * it does fix up the text when finishing completion. */ compl_get_longest = FALSE; - if (c != K_IGNORE && ins_compl_prep(c)) + if (ins_compl_prep(c)) continue; #endif @@ -4516,15 +4519,17 @@ ins_compl_check_keys(frequency) else { /* Need to get the character to have KeyTyped set. We'll put it - * back with vungetc() below. */ + * back with vungetc() below. But skip K_IGNORE. */ c = safe_vgetc(); + if (c != K_IGNORE) + { + /* Don't interrupt completion when the character wasn't typed, + * e.g., when doing @q to replay keys. */ + if (c != Ctrl_R && KeyTyped) + compl_interrupted = TRUE; - /* Don't interrupt completion when the character wasn't typed, - * e.g., when doing @q to replay keys. */ - if (c != Ctrl_R && KeyTyped) - compl_interrupted = TRUE; - - vungetc(c); + vungetc(c); + } } } if (compl_pending != 0 && !got_int) diff --git a/src/version.c b/src/version.c index 505d3a55d..b8e6a04a8 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 241, +/**/ 240, /**/ 239, |