diff options
| author | Thiago de Arruda <tpadilha84@gmail.com> | 2015-03-16 10:59:29 -0300 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2015-03-16 10:59:29 -0300 |
| commit | f6d4bfd51bb68d84bfc265fa973ea75978ecf304 (patch) | |
| tree | cde83d46453e3cd56840a16191525826584062f6 | |
| parent | 7eee9c2a220fd1f0e600ae365e996fb56aa4cec1 (diff) | |
| parent | 1d80c0e3a058dcb6b0ee94e796ac258d1c61caaa (diff) | |
| download | rneovim-f6d4bfd51bb68d84bfc265fa973ea75978ecf304.tar.gz rneovim-f6d4bfd51bb68d84bfc265fa973ea75978ecf304.tar.bz2 rneovim-f6d4bfd51bb68d84bfc265fa973ea75978ecf304.zip | |
Merge PR #2164 'Small changes to ui_busy functions and testing'
| -rw-r--r-- | src/nvim/misc1.c | 2 | ||||
| -rw-r--r-- | src/nvim/ui.c | 4 | ||||
| -rw-r--r-- | test/functional/shell/viml_system_spec.lua | 4 | ||||
| -rw-r--r-- | test/functional/ui/screen.lua | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c index 9c08a7c1f7..07cbc0f7c4 100644 --- a/src/nvim/misc1.c +++ b/src/nvim/misc1.c @@ -2364,7 +2364,7 @@ int get_keystroke(void) mapped_ctrl_c = FALSE; /* mappings are not used here */ for (;; ) { - + ui_flush(); /* Leave some room for check_termcode() to insert a key code into (max * 5 chars plus NUL). And fix_input_buffer() can triple the number of * bytes. */ diff --git a/src/nvim/ui.c b/src/nvim/ui.c index 0283e7bd62..2189021d22 100644 --- a/src/nvim/ui.c +++ b/src/nvim/ui.c @@ -155,16 +155,16 @@ void ui_busy_start(void) { if (!(busy++)) { UI_CALL(busy_start); + ui_flush(); } - ui_flush(); } void ui_busy_stop(void) { if (!(--busy)) { UI_CALL(busy_stop); + ui_flush(); } - ui_flush(); } diff --git a/test/functional/shell/viml_system_spec.lua b/test/functional/shell/viml_system_spec.lua index 2742e23e00..c9ae92048c 100644 --- a/test/functional/shell/viml_system_spec.lua +++ b/test/functional/shell/viml_system_spec.lua @@ -93,7 +93,7 @@ describe('system()', function() ~ | ~ | ~ | - ^:call system("yes") | + :call system("yes") | ]]) feed('<c-c>') screen:expect([[ @@ -259,7 +259,7 @@ describe('systemlist()', function() ~ | ~ | ~ | - ^:call systemlist("yes | xargs") | + :call systemlist("yes | xargs") | ]]) feed('<c-c>') screen:expect([[ diff --git a/test/functional/ui/screen.lua b/test/functional/ui/screen.lua index 7ba90abde2..2cebaf048c 100644 --- a/test/functional/ui/screen.lua +++ b/test/functional/ui/screen.lua @@ -417,7 +417,7 @@ function Screen:_row_repr(row, attr_ids, attr_ignore) table.insert(rv, '{' .. attr_id .. ':') current_attr_id = attr_id end - if self._rows[self._cursor.row] == row and self._cursor.col == i then + if not self._busy and self._rows[self._cursor.row] == row and self._cursor.col == i then table.insert(rv, '^') end table.insert(rv, row[i].text) |