patch 8.1.0076: command getting cleared with CTRL-W : in a terminal window

Problem:    Command getting cleared with CTRL-W : in a terminal window. (Jason
            Franklin)
Solution:   Call redraw_after_callback() when editing the command line.

diff --git a/src/terminal.c b/src/terminal.c
index f4fa551659198d1813b3c890c0d39ebde420470c..a67c87a4bed2d70ce2e4395f06731d457457b993 100644 (file)
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -973,11 +973,13 @@ write_to_term(buf_T *buffer, char_u *msg, channel_T *channel)
      * contents, thus no screen update is needed. */
     if (!term->tl_normal_mode)
     {
-       /* TODO: only update once in a while. */
+       // Don't use update_screen() when editing the command line, it gets
+       // cleared.
+       // TODO: only update once in a while.
        ch_log(term->tl_job->jv_channel, "updating screen");
-       if (buffer == curbuf)
+       if (buffer == curbuf && (State & CMDLINE) == 0)
        {
-           update_screen(0);
+           update_screen(VALID_NO_UPDATE);
            /* update_screen() can be slow, check the terminal wasn't closed
             * already */
            if (buffer == curbuf && curbuf->b_term != NULL)

diff --git a/src/version.c b/src/version.c
index bc79f7d2a731bd093cc65531f4fdc554f4a611ee..04923fb3fb9d1e2520d18b92e94e2a003218d03b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    76,
 /**/
     75,
 /**/