aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/memline.c
diff options
context:
space:
mode:
authorThiago de Arruda <tpadilha84@gmail.com>2014-11-27 12:54:26 -0300
committerThiago de Arruda <tpadilha84@gmail.com>2014-11-27 14:12:59 -0300
commit541eaf598c25e0b853ef441b57c9f7d1bbf3450c (patch)
tree62919511c5968a76b8add898b812aeaf2edc02a5 /src/nvim/memline.c
parentf6c89ec70409badb7ca477de47dd1f8dbf3de376 (diff)
downloadrneovim-541eaf598c25e0b853ef441b57c9f7d1bbf3450c.tar.gz
rneovim-541eaf598c25e0b853ef441b57c9f7d1bbf3450c.tar.bz2
rneovim-541eaf598c25e0b853ef441b57c9f7d1bbf3450c.zip
ui: Remove ui_inchar/ui_char_avail
Also: - Remove NO_CONSOLE_INPUT/NO_CONSULE preprocessor conditionals - Remove ctrl_c_interrupts variable, check for mapped_ctrl_c directly in process_interrupts() - Move ui_inchar profiling to input_poll which is where Nvim blocks for input.
Diffstat (limited to 'src/nvim/memline.c')
-rw-r--r--src/nvim/memline.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/memline.c b/src/nvim/memline.c
index e9edeb842f..469601d37a 100644
--- a/src/nvim/memline.c
+++ b/src/nvim/memline.c
@@ -75,6 +75,7 @@
#include "nvim/undo.h"
#include "nvim/window.h"
#include "nvim/os/os.h"
+#include "nvim/os/input.h"
#ifndef UNIX /* it's in os_unix_defs.h for Unix */
# include <time.h>
@@ -1642,7 +1643,7 @@ void ml_sync_all(int check_file, int check_char)
if (buf->b_ml.ml_mfp->mf_dirty) {
(void)mf_sync(buf->b_ml.ml_mfp, (check_char ? MFS_STOP : 0)
| (bufIsChanged(buf) ? MFS_FLUSH : 0));
- if (check_char && ui_char_avail()) /* character available now */
+ if (check_char && os_char_avail()) /* character available now */
break;
}
}