mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-27 05:28:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.0.1786: no test for 'termwinkey'

Browse Source 
Problem:    No test for 'termwinkey'.
Solution:   Add a test.  Make feedkeys() handle terminal_loop() returning
            before characters are consumed.
b2ac14c0b5
This commit is contained in:
Jan Edmund Lazo
2020-01-05 08:17:55 -05:00
parent fa9b057d35
commit e7d49dc909
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/nvim/getchar.c
View File

@@ -1562,7 +1562,7 @@ int vpeekc(void)
{ {
if (old_char != -1) if (old_char != -1)
return old_char; return old_char;
return vgetorpeek(FALSE); return vgetorpeek(false);
} }
/* /*
@@ -1615,20 +1615,20 @@ vungetc ( /* unget one character (can only be done once!) */
/// Also stores the result of mappings. /// Also stores the result of mappings.
/// Also used for the ":normal" command. /// Also used for the ":normal" command.
/// 3. from the user /// 3. from the user
/// This may do a blocking wait if "advance" is TRUE. /// This may do a blocking wait if "advance" is true.
/// ///
/// if "advance" is TRUE (vgetc()): /// if "advance" is true (vgetc()):
/// Really get the character. /// Really get the character.
/// KeyTyped is set to TRUE in the case the user typed the key. /// KeyTyped is set to TRUE in the case the user typed the key.
/// KeyStuffed is TRUE if the character comes from the stuff buffer. /// KeyStuffed is TRUE if the character comes from the stuff buffer.
/// if "advance" is FALSE (vpeekc()): /// if "advance" is false (vpeekc()):
/// Just look whether there is a character available. /// Just look whether there is a character available.
/// Return NUL if not. /// Return NUL if not.
/// ///
/// When `no_mapping` (global) is zero, checks for mappings in the current mode. /// When `no_mapping` (global) is zero, checks for mappings in the current mode.
/// Only returns one byte (of a multi-byte character). /// Only returns one byte (of a multi-byte character).
/// K_SPECIAL and CSI may be escaped, need to get two more bytes then. /// K_SPECIAL and CSI may be escaped, need to get two more bytes then.
static int vgetorpeek(int advance) static int vgetorpeek(bool advance)
{ {
int c, c1; int c, c1;
int keylen; int keylen;
@@ -1721,7 +1721,7 @@ static int vgetorpeek(int advance)
// flush all input // flush all input
c = inchar(typebuf.tb_buf, typebuf.tb_buflen - 1, 0L); c = inchar(typebuf.tb_buf, typebuf.tb_buflen - 1, 0L);
// If inchar() returns TRUE (script file was active) or we // If inchar() returns TRUE (script file was active) or we
// are inside a mapping, get out of insert mode. // are inside a mapping, get out of Insert mode.
// Otherwise we behave like having gotten a CTRL-C. // Otherwise we behave like having gotten a CTRL-C.
// As a result typing CTRL-C in insert mode will // As a result typing CTRL-C in insert mode will
// really insert a CTRL-C. // really insert a CTRL-C.
@@ -2324,7 +2324,7 @@ static int vgetorpeek(int advance)
} /* for (;;) */ } /* for (;;) */
} /* if (!character from stuffbuf) */ } /* if (!character from stuffbuf) */
/* if advance is FALSE don't loop on NULs */ // if advance is false don't loop on NULs
} while (c < 0 || (advance && c == NUL)); } while (c < 0 || (advance && c == NUL));
/* /*