diff options
| author | Thiago de Arruda <tpadilha84@gmail.com> | 2014-11-27 16:08:44 -0300 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2014-11-27 16:08:44 -0300 |
| commit | dca8853f0031ab7ac960037d3b848107355d7056 (patch) | |
| tree | 90cecee10a75f8035fd0df02629d999853318450 /src/nvim/main.c | |
| parent | f6c89ec70409badb7ca477de47dd1f8dbf3de376 (diff) | |
| parent | bf6bb27e79f53646309ba075655465919bc2e60c (diff) | |
| download | rneovim-dca8853f0031ab7ac960037d3b848107355d7056.tar.gz rneovim-dca8853f0031ab7ac960037d3b848107355d7056.tar.bz2 rneovim-dca8853f0031ab7ac960037d3b848107355d7056.zip | |
Merge PR #1565 'Cleanup ui module'
Diffstat (limited to 'src/nvim/main.c')
| -rw-r--r-- | src/nvim/main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c index 4447c404d5..68ae000c35 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -57,6 +57,7 @@ #include "nvim/ui.h" #include "nvim/version.h" #include "nvim/window.h" +#include "nvim/os/time.h" #include "nvim/os/input.h" #include "nvim/os/os.h" #include "nvim/os/signal.h" @@ -1608,7 +1609,7 @@ static void check_tty(mparm_T *parmp) mch_errmsg(_("Vim: Warning: Input is not from a terminal\n")); out_flush(); if (scriptin[0] == NULL) - ui_delay(2000L, true); + os_delay(2000L, true); TIME_MSG("Warning delay"); } } @@ -1742,7 +1743,7 @@ static void create_windows(mparm_T *parmp) #endif dorewind = TRUE; /* start again */ } - ui_breakcheck(); + os_breakcheck(); if (got_int) { (void)vgetc(); /* only break the file loading, not the rest */ break; @@ -1832,7 +1833,7 @@ static void edit_buffers(mparm_T *parmp) arg_had_last = TRUE; ++arg_idx; } - ui_breakcheck(); + os_breakcheck(); if (got_int) { (void)vgetc(); /* only break the file loading, not the rest */ break; |