forked from aniani/vim
patch 9.1.1330: may receive E315 in terminal
Problem: may receive E315 in terminal Solution: call check_cursor() (Hirohito Higashi) fixes: #16024 fixes: #16211 fixes: #17099 closes: #17170 Signed-off-by: Hirohito Higashi <h.east.727@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
parent
16341e7090
commit
926e2af42e
10
src/mouse.c
10
src/mouse.c
@ -1902,16 +1902,6 @@ retnomove:
|
||||
// Drag the status line
|
||||
count = row - W_WINROW(dragwin) - dragwin->w_height + 1
|
||||
- on_status_line;
|
||||
#ifdef FEAT_TERMINAL
|
||||
if (bt_terminal(dragwin->w_buffer))
|
||||
{
|
||||
win_T *curwin_save = curwin;
|
||||
curwin = dragwin;
|
||||
update_topline();
|
||||
validate_cursor();
|
||||
curwin = curwin_save;
|
||||
}
|
||||
#endif
|
||||
win_drag_status_line(dragwin, count);
|
||||
did_drag |= count;
|
||||
}
|
||||
|
@ -3454,8 +3454,23 @@ limit_scrollback(term_T *term, garray_T *gap, int update_buffer)
|
||||
(sb_line_T *)gap->ga_data + todo,
|
||||
sizeof(sb_line_T) * gap->ga_len);
|
||||
if (update_buffer)
|
||||
{
|
||||
win_T *curwin_save = curwin;
|
||||
win_T *wp = NULL;
|
||||
|
||||
term->tl_scrollback_scrolled -= todo;
|
||||
|
||||
FOR_ALL_WINDOWS(wp)
|
||||
{
|
||||
if (wp->w_buffer == term->tl_buffer)
|
||||
{
|
||||
curwin = wp;
|
||||
check_cursor();
|
||||
}
|
||||
}
|
||||
curwin = curwin_save;
|
||||
}
|
||||
|
||||
// make sure cursor is on a valid line
|
||||
if (curbuf == term->tl_buffer)
|
||||
check_cursor();
|
||||
|
@ -704,6 +704,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
1330,
|
||||
/**/
|
||||
1329,
|
||||
/**/
|
||||
|
@ -5643,10 +5643,6 @@ win_enter_ext(win_T *wp, int flags)
|
||||
did_decrement = TRUE;
|
||||
}
|
||||
#endif
|
||||
#ifdef FEAT_TERMINAL
|
||||
if (bt_terminal(curwin->w_buffer))
|
||||
update_topline();
|
||||
#endif
|
||||
|
||||
win_fix_current_dir();
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user