mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-02-08 12:57:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #2164 'Small changes to ui_busy functions and testing'

Browse Source
This commit is contained in:
Thiago de Arruda
2015-03-16 10:59:29 -03:00
parent 7eee9c2a22 1d80c0e3a0
commit f6d4bfd51b
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/misc1.c
View File

@@ -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. */

4
src/nvim/ui.c
View File

@@ -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();
}

4
test/functional/shell/viml_system_spec.lua
View File

@@ -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([[

2
test/functional/ui/screen.lua
View File

@@ -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)