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 895a4359928ddcc18d7d6b09ee093e19785e8819..c79d2b8c870583becc87c86fa1ec3d5c2c1199f7 100644 (file)
--- 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 2827368983aa7186757ebca710813b0828d18152..34ef9201769eb1e225017775737dcd869721e9a0 100644 (file)
--- 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,
 /**/