diff options
author | Bram Moolenaar <bram@vim.org> | 2014-11-12 18:59:25 +0100 |
---|---|---|
committer | Bram Moolenaar <bram@vim.org> | 2014-11-12 18:59:25 +0100 |
commit | 14594d0493bdbab05e80899dca2ce5475aa4cded (patch) | |
tree | d6c2b6241c1377cdb08eedc90de69eda3579eddf | |
parent | e2d7f22777d5c870c968e8c8d2505e37422831fc (diff) | |
download | vim-14594d0493bdbab05e80899dca2ce5475aa4cded.tar.gz |
Problem: Memory access error. (Dominique Pelle)
Solution: Update tpos. (Christian Brabandt)
-rw-r--r-- | src/edit.c | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 0 deletions
@@ -6918,6 +6918,8 @@ stop_insert(end_insert_pos, esc, nomove) curwin->w_cursor = tpos; else { + /* reset tpos, could have been invalidated in the loop above */ + tpos = curwin->w_cursor; tpos.col++; if (cc != NUL && gchar_pos(&tpos) == NUL) ++curwin->w_cursor.col; /* put cursor back on the NUL */ diff --git a/src/version.c b/src/version.c index df18f5e9..5ca2f272 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 514, +/**/ 513, /**/ 512, |