diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-05-01 18:47:59 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-05-01 18:47:59 +0200 |
| commit | b2ac14c0b5e23f8ab97c5c784bcd83e13ba8ded3 (patch) | |
| tree | ccd71c85b849644e14fdbb4f85d2658542443dee /src/terminal.c | |
| parent | 8a938af6ddefab4b4bc751d3f3545e1d95622c8a (diff) | |
| download | vim-git-b2ac14c0b5e23f8ab97c5c784bcd83e13ba8ded3.tar.gz | |
patch 8.0.1786: no test for 'termwinkey'v8.0.1786
Problem: No test for 'termwinkey'.
Solution: Add a test. Make feedkeys() handle terminal_loop() returning
before characters are consumed.
Diffstat (limited to 'src/terminal.c')
| -rw-r--r-- | src/terminal.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/terminal.c b/src/terminal.c index 9b336ee87..1fd9ed2ab 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -42,7 +42,6 @@ * redirection. Probably in call to channel_set_pipes(). * - Win32: Redirecting output does not work, Test_terminal_redir_file() * is disabled. - * - Add test for 'termwinkey'. * - When starting terminal window with shell in terminal, then using :gui to * switch to GUI, shell stops working. Scrollback seems wrong, command * running in shell is still running. @@ -1690,6 +1689,7 @@ send_keys_to_term(term_T *term, int c, int typed) return FAIL; case K_IGNORE: + case K_CANCEL: // used for :normal when running out of chars return FAIL; case K_LEFTDRAG: @@ -1826,9 +1826,9 @@ term_paste_register(int prev_c UNUSED) } } -#if defined(FEAT_GUI) || defined(PROTO) /* - * Return TRUE when the cursor of the terminal should be displayed. + * Return TRUE when waiting for a character in the terminal, the cursor of the + * terminal should be displayed. */ int terminal_is_active() @@ -1836,6 +1836,7 @@ terminal_is_active() return in_terminal_loop != NULL; } +#if defined(FEAT_GUI) || defined(PROTO) cursorentry_T * term_get_cursor_shape(guicolor_T *fg, guicolor_T *bg) { |