summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main.c4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c
index 895a43599..c79d2b8c8 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 282736898..34ef92017 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,