thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.1546: using feedkeys() in a terminal may trigger mappings

Browse Source 
Problem:    Using feedkeys() in a terminal window may trigger mappings.
            (Charles Sheridan)
Solution:   Avoid triggering a mapping when peeking for a key.
This commit is contained in:
Bram Moolenaar
2018-02-27 16:29:28 +01:00
parent 8226ac6b59
commit c8bcfe7efd
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/terminal.c
View File

@@ -1306,10 +1306,9 @@ term_enter_job_mode()
}
/*
* Get a key from the user without mapping.
* Get a key from the user with terminal mode mappings.
* Note: while waiting a terminal may be closed and freed if the channel is
* closed and ++close was used.
* Uses terminal mode mappings.
*/
static int
term_vgetc()
@@ -1633,7 +1632,7 @@ terminal_loop(int blocking)
position_cursor(curwin, &curbuf->b_term->tl_cursor_pos);
may_set_cursor_props(curbuf->b_term);
while (blocking || vpeekc() != NUL)
while (blocking || vpeekc_nomap() != NUL)
{
/* TODO: skip screen update when handling a sequence of keys. */
/* Repeat redrawing in case a message is received while redrawing. */