Permalink
Browse files

patch 8.0.1838: cursor in wrong pos when switching to Terminal-Normal…

… mode

Problem:    Cursor in wrong position when switching to Terminal-Normal mode.
            (Dominique Pelle)
Solution:   Move to the end of the line if coladvance() fails.  Do not take a
            snapshot a second time.
  • Loading branch information...
brammool committed May 13, 2018
1 parent 5e3423d commit 620020eb1d937e1fd9068ee97d5ef70a99913361
Showing with 6 additions and 4 deletions.
  1. +4 −4 src/terminal.c
  2. +2 −0 src/version.c
@@ -1709,7 +1709,8 @@ term_enter_normal_mode(void)
curwin->w_cursor.lnum = term->tl_scrollback_scrolled
+ term->tl_cursor_pos.row + 1;
check_cursor();
coladvance(term->tl_cursor_pos.col);
if (coladvance(term->tl_cursor_pos.col) == FAIL)
coladvance(MAXCOL);
/* Display the same lines as in the terminal. */
curwin->w_topline = term->tl_scrollback_scrolled + 1;
@@ -2264,9 +2265,8 @@ terminal_loop(int blocking)
/* Move a snapshot of the screen contents to the buffer, so that completion
* works in other buffers. */
if (curbuf->b_term != NULL)
may_move_terminal_to_buffer(
curbuf->b_term, curbuf->b_term->tl_normal_mode);
if (curbuf->b_term != NULL && !curbuf->b_term->tl_normal_mode)
may_move_terminal_to_buffer(curbuf->b_term, FALSE);
return ret;
}
@@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1838,
/**/
1837,
/**/

0 comments on commit 620020e

Please sign in to comment.