From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 15 Feb 2011 15:29:59 +0000 (+0100)
Subject: updated for version 7.3.123
X-Git-Tag: v7.3.123
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c2b4c62d0b3b25d2bb9bfc1e7e65c431e73ea1df;p=vim

updated for version 7.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.
---

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
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    123,
 /**/
     122,
 /**/