diff options
| author | Bram Moolenaar <Bram@vim.org> | 2011-02-15 16:29:59 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2011-02-15 16:29:59 +0100 |
| commit | c2b4c62d0b3b25d2bb9bfc1e7e65c431e73ea1df (patch) | |
| tree | bc93615b34b2341b6a02ba6f8221259dd1c8e185 | |
| parent | 542512a3e5582ad6630aac0f05dddcdef1558031 (diff) | |
updated for version 7.3.123v7.3.123
Problem: ml_get error when executing register being recorded into, deleting
lines and 'conceallevel' is set. (ZyX)
Solution: Don't redraw a line for concealing when it doesn't exist.
| -rw-r--r-- | src/main.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c index 895a435992..c79d2b8c87 100644 --- a/src/main.c +++ b/src/main.c @@ -1198,7 +1198,9 @@ main_loop(cmdwin, noexmode) || conceal_cursor_line(curwin) || need_cursor_line_redraw)) { - if (conceal_old_cursor_line != conceal_new_cursor_line) + if (conceal_old_cursor_line != conceal_new_cursor_line + && conceal_old_cursor_line + <= curbuf->b_ml.ml_line_count) update_single_line(curwin, conceal_old_cursor_line); update_single_line(curwin, conceal_new_cursor_line); curwin->w_valid &= ~VALID_CROW; diff --git a/src/version.c b/src/version.c index 2827368983..34ef920176 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 123, +/**/ 122, /**/ 121, |