# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1501434004 -7200
# Node ID a83b19a8d7e4ef4c6e8333409505afbf83c32610
# Parent  756b19fccb6a2b1446a838a7c07c17fea41199a6
patch 8.0.0819: cursor not positioned in terminal window

commit https://github.com/vim/vim/commit/0e23e9c5e74dbf0e5eec710c41c9eaed35794682
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Jul 30 18:47:19 2017 +0200

    patch 8.0.0819: cursor not positioned in terminal window

    Problem:    After changing current window the cursor position in the terminal
                window is not updated.
    Solution:   Set w_wrow, w_wcol and w_valid.

diff --git a/src/terminal.c b/src/terminal.c
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -857,6 +857,14 @@ send_keys_to_term(term_T *term, int c, i
     return OK;
 }
 
+    static void
+position_cursor(win_T *wp, VTermPos *pos)
+{
+    wp->w_wrow = MIN(pos->row, MAX(0, wp->w_height - 1));
+    wp->w_wcol = MIN(pos->col, MAX(0, wp->w_width - 1));
+    wp->w_valid |= (VALID_WCOL|VALID_WROW);
+}
+
 /*
  * Returns TRUE if the current window contains a terminal and we are sending
  * keys to the job.
@@ -887,6 +895,7 @@ terminal_loop(void)
 
     if (*curwin->w_p_tk != NUL)
 	termkey = string_to_key(curwin->w_p_tk, TRUE);
+    position_cursor(curwin, &curbuf->b_term->tl_cursor_pos);
 
     for (;;)
     {
@@ -972,13 +981,6 @@ term_job_ended(job_T *job)
 }
 
     static void
-position_cursor(win_T *wp, VTermPos *pos)
-{
-    wp->w_wrow = MIN(pos->row, MAX(0, wp->w_height - 1));
-    wp->w_wcol = MIN(pos->col, MAX(0, wp->w_width - 1));
-}
-
-    static void
 may_toggle_cursor(term_T *term)
 {
     if (curbuf == term->tl_buffer)
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    819,
+/**/
     818,
 /**/
     817,