diff options
author | Thiago de Arruda <tpadilha84@gmail.com> | 2015-02-21 06:33:18 -0300 |
---|---|---|
committer | Thiago de Arruda <tpadilha84@gmail.com> | 2015-02-21 06:33:18 -0300 |
commit | c48f835749913f48267ed3b389bdd333e19e6dc4 (patch) | |
tree | edc8d4310b1e4025697a4ae0e9f39c2973fb3725 /src/nvim/os/shell.c | |
parent | 486d2e944dffb30d97d65c88bbcc77f6fd1208f6 (diff) | |
parent | 6293b5513c54557bbf56077374df83cb52344fa3 (diff) | |
download | rneovim-c48f835749913f48267ed3b389bdd333e19e6dc4.tar.gz rneovim-c48f835749913f48267ed3b389bdd333e19e6dc4.tar.bz2 rneovim-c48f835749913f48267ed3b389bdd333e19e6dc4.zip |
Merge PR #1997 'Remove term modules'
Diffstat (limited to 'src/nvim/os/shell.c')
-rw-r--r-- | src/nvim/os/shell.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/nvim/os/shell.c b/src/nvim/os/shell.c index d481d6af56..32c7ea564d 100644 --- a/src/nvim/os/shell.c +++ b/src/nvim/os/shell.c @@ -17,7 +17,7 @@ #include "nvim/vim.h" #include "nvim/message.h" #include "nvim/memory.h" -#include "nvim/term.h" +#include "nvim/ui.h" #include "nvim/misc2.h" #include "nvim/screen.h" #include "nvim/memline.h" @@ -99,7 +99,7 @@ int os_call_shell(char_u *cmd, ShellOpts opts, char_u *extra_args) char *output = NULL, **output_ptr = NULL; int current_state = State; bool forward_output = true; - out_flush(); + ui_flush(); // While the child is running, ignore terminating signals signal_reject_deadly(); @@ -421,7 +421,7 @@ static size_t write_output(char *output, size_t remaining, bool to_buffer, if (to_buffer) { ml_append(curwin->w_cursor.lnum++, (char_u *)output, 0, false); } else { - screen_del_lines(0, 0, 1, (int)Rows, true, NULL); + screen_del_lines(0, 0, 1, (int)Rows, NULL); screen_puts_len((char_u *)output, (int)off, lastrow, 0, 0); } size_t skip = off + 1; @@ -446,7 +446,7 @@ static size_t write_output(char *output, size_t remaining, bool to_buffer, // remember that the NL was missing curbuf->b_no_eol_lnum = curwin->w_cursor.lnum; } else { - screen_del_lines(0, 0, 1, (int)Rows, true, NULL); + screen_del_lines(0, 0, 1, (int)Rows, NULL); screen_puts_len((char_u *)output, (int)remaining, lastrow, 0, 0); } output += remaining; @@ -455,7 +455,7 @@ static size_t write_output(char *output, size_t remaining, bool to_buffer, } } - out_flush(); + ui_flush(); return (size_t)(output - start); } |