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/fileio.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/fileio.c')
| -rw-r--r-- | src/nvim/fileio.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index 97a357bff7..3be9d89d87 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -53,10 +53,11 @@ #include "nvim/tempfile.h" #include "nvim/term.h" #include "nvim/types.h" -#include "nvim/ui.h" #include "nvim/undo.h" #include "nvim/window.h" #include "nvim/os/os.h" +#include "nvim/os/time.h" +#include "nvim/os/input.h" #if defined(HAVE_UTIME) && defined(HAVE_UTIME_H) # include <utime.h> /* for struct utimbuf */ @@ -1704,7 +1705,7 @@ rewind_retry: } } linerest = (long)(ptr - line_start); - ui_breakcheck(); + os_breakcheck(); } failed: @@ -2927,7 +2928,7 @@ buf_write ( "E506: Can't write to backup file (add ! to override)"); break; } - ui_breakcheck(); + os_breakcheck(); if (got_int) { errmsg = (char_u *)_(e_interr); break; @@ -3377,7 +3378,7 @@ restore_backup: s = buffer; len = 0; - ui_breakcheck(); + os_breakcheck(); if (got_int) { end = 0; /* Interrupted, break loop */ break; @@ -4958,7 +4959,7 @@ buf_check_timestamp ( if (emsg_silent == 0) { out_flush(); /* give the user some time to think about it */ - ui_delay(1000L, true); + os_delay(1000L, true); /* don't redraw and erase the message */ redraw_cmdline = FALSE; |