patch 7.4.1750

Problem:    When a buffer gets updated while in command line mode, the screen
            may be messed up.
Solution:   Postpone the redraw when the screen is scrolled.

diff --git a/src/channel.c b/src/channel.c
index 72484ecb0483d7c1c4ca0f98a94625163c4ea8c6..892c09ab7e42c382fab9ffa7a7393f4edec6227f 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -1431,6 +1431,7 @@ channel_write_new_lines(buf_T *buf)
 
 /*
  * Invoke the "callback" on channel "channel".
+ * This does not redraw but sets channel_need_redraw;
  */
     static void
 invoke_callback(channel_T *channel, char_u *callback, partial_T *partial,
@@ -1445,8 +1446,7 @@ invoke_callback(channel_T *channel, char_u *callback, partial_T *partial,
     call_func(callback, (int)STRLEN(callback),
                        &rettv, 2, argv, 0L, 0L, &dummy, TRUE, partial, NULL);
     clear_tv(&rettv);
-
-    redraw_after_callback();
+    channel_need_redraw = TRUE;
 }
 
 /*
@@ -2009,6 +2009,10 @@ channel_exe_cmd(channel_T *channel, int part, typval_T *argv)
     }
 }
 
+/*
+ * Invoke the callback at "cbhead".
+ * Does not redraw but sets channel_need_redraw.
+ */
     static void
 invoke_one_time_callback(
        channel_T   *channel,
@@ -2099,6 +2103,7 @@ append_to_buffer(buf_T *buffer, char_u *msg, channel_T *channel)
 
 /*
  * Invoke a callback for "channel"/"part" if needed.
+ * This does not redraw but sets channel_need_redraw when redraw is needed.
  * Return TRUE when a message was handled, there might be another one.
  */
     static int
@@ -3468,13 +3473,10 @@ channel_parse_messages(void)
        }
     }
 
-    if (channel_need_redraw && must_redraw)
+    if (channel_need_redraw)
     {
        channel_need_redraw = FALSE;
-       update_screen(0);
-       setcursor();
-       cursor_on();
-       out_flush();
+       redraw_after_callback();
     }
 
     return ret;

diff --git a/src/version.c b/src/version.c
index fa09585486b437508e3a07b2f8748e0d46879365..695d0b731d91974a9e651cbd8ba962a5eb9eec75 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1750,
 /**/
     1749,
 /**/