diff options
author | Bram Moolenaar <Bram@vim.org> | 2008-01-03 15:34:40 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2008-01-03 15:34:40 +0000 |
commit | aacbb0039c2707997726444ab74341a5145e0ba1 (patch) | |
tree | 67157db7ae255d7f62ea2e52659eb86dec0058f3 | |
parent | 6784078701dc1ad93348238a38202027e23854fe (diff) | |
download | vim-git-aacbb0039c2707997726444ab74341a5145e0ba1.tar.gz |
updated for version 7.1-192v7.1.192
-rw-r--r-- | src/ops.c | 10 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 4 deletions
@@ -2468,9 +2468,10 @@ op_insert(oap, count1) edit(NUL, FALSE, (linenr_T)count1); - /* if user has moved off this line, we don't know what to do, so do - * nothing */ - if (curwin->w_cursor.lnum != oap->start.lnum) + /* If user has moved off this line, we don't know what to do, so do + * nothing. + * Also don't repeat the insert when Insert mode ended with CTRL-C. */ + if (curwin->w_cursor.lnum != oap->start.lnum || got_int) return; if (oap->block_mode) @@ -2601,8 +2602,9 @@ op_change(oap) /* * In Visual block mode, handle copying the new text to all lines of the * block. + * Don't repeat the insert when Insert mode ended with CTRL-C. */ - if (oap->block_mode && oap->start.lnum != oap->end.lnum) + if (oap->block_mode && oap->start.lnum != oap->end.lnum && !got_int) { /* Auto-indenting may have changed the indent. If the cursor was past * the indent, exclude that indent change from the inserted text. */ diff --git a/src/version.c b/src/version.c index 55fdbac99..676f901f2 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 */ /**/ + 192, +/**/ 191, /**/ 190, |