From 1865b8c1c115b639a4a12b5a9cb287a62a82ac76 Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Thu, 27 Nov 2014 14:10:42 -0300 Subject: ui: Remove ui_delay, ui_breakcheck and ui_set_shellsize These functions only used to call another os_* function, so remove them and replace all occurences in the project. --- src/nvim/ops.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/nvim/ops.c') diff --git a/src/nvim/ops.c b/src/nvim/ops.c index 5ef605bb3b..edec3518cb 100644 --- a/src/nvim/ops.c +++ b/src/nvim/ops.c @@ -48,7 +48,7 @@ #include "nvim/ui.h" #include "nvim/undo.h" #include "nvim/window.h" -#include "nvim/api/private/helpers.h" +#include "nvim/os/input.h" /* * Registers: @@ -1112,7 +1112,7 @@ insert_reg ( * register a and then, in insert mode, doing CTRL-R a. * If you hit CTRL-C, the loop will be broken here. */ - ui_breakcheck(); + os_breakcheck(); if (got_int) return FAIL; @@ -1296,7 +1296,7 @@ cmdline_paste_reg ( /* Check for CTRL-C, in case someone tries to paste a few thousand * lines and gets bored. */ - ui_breakcheck(); + os_breakcheck(); if (got_int) return FAIL; } @@ -3254,7 +3254,7 @@ void ex_display(exarg_T *eap) MSG_PUTS_ATTR("^J", attr); out_flush(); /* show one line at a time */ } - ui_breakcheck(); + os_breakcheck(); } /* @@ -3339,7 +3339,7 @@ dis_msg ( } else msg_outtrans_len(p++, 1); } - ui_breakcheck(); + os_breakcheck(); } /* @@ -5079,7 +5079,7 @@ void cursor_pos_info(void) for (lnum = 1; lnum <= curbuf->b_ml.ml_line_count; ++lnum) { /* Check for a CTRL-C every 100000 characters. */ if (byte_count > last_check) { - ui_breakcheck(); + os_breakcheck(); if (got_int) return; last_check = byte_count + 100000L; -- cgit From bf6bb27e79f53646309ba075655465919bc2e60c Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Thu, 27 Nov 2014 14:58:04 -0300 Subject: ui: Remove redundant ui.h includes Also move read_error_exit to os/input.c --- src/nvim/ops.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src/nvim/ops.c') diff --git a/src/nvim/ops.c b/src/nvim/ops.c index edec3518cb..6bf3f6036f 100644 --- a/src/nvim/ops.c +++ b/src/nvim/ops.c @@ -45,7 +45,6 @@ #include "nvim/search.h" #include "nvim/strings.h" #include "nvim/term.h" -#include "nvim/ui.h" #include "nvim/undo.h" #include "nvim/window.h" #include "nvim/os/input.h" -- cgit