aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/terminal.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2016-05-31 13:49:04 -0400
committerJustin M. Keyes <justinkz@gmail.com>2016-05-31 13:49:04 -0400
commit3dd3d129d3a4644c3f2c4de4df4b2ceda380448e (patch)
tree0c7358f88da7baec437c89f937e105a1e8adfbf9 /src/nvim/terminal.c
parent4276a03e8185e9498e4b7983bf02e151c4b4b197 (diff)
parent77540a04582927e842c7d5522bb862756da2cbba (diff)
downloadrneovim-3dd3d129d3a4644c3f2c4de4df4b2ceda380448e.tar.gz
rneovim-3dd3d129d3a4644c3f2c4de4df4b2ceda380448e.tar.bz2
rneovim-3dd3d129d3a4644c3f2c4de4df4b2ceda380448e.zip
Merge pull request #4844 from ZyX-I/rename-main-loop
Rename main loop variable from loop to main_loop
Diffstat (limited to 'src/nvim/terminal.c')
-rw-r--r--src/nvim/terminal.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/nvim/terminal.c b/src/nvim/terminal.c
index 104cc47cda..df5e03880a 100644
--- a/src/nvim/terminal.c
+++ b/src/nvim/terminal.c
@@ -63,6 +63,7 @@
#include "nvim/map.h"
#include "nvim/misc1.h"
#include "nvim/move.h"
+#include "nvim/main.h"
#include "nvim/state.h"
#include "nvim/ex_docmd.h"
#include "nvim/ex_cmds.h"
@@ -163,9 +164,9 @@ static VTermColor default_vt_bg_rgb;
void terminal_init(void)
{
invalidated_terminals = pmap_new(ptr_t)();
- time_watcher_init(&loop, &refresh_timer, NULL);
+ time_watcher_init(&main_loop, &refresh_timer, NULL);
// refresh_timer_cb will redraw the screen which can call vimscript
- refresh_timer.events = queue_new_child(loop.events);
+ refresh_timer.events = queue_new_child(main_loop.events);
// initialize a rgb->color index map for cterm attributes(VTermScreenCell
// only has RGB information and we need color indexes for terminal UIs)
@@ -452,7 +453,7 @@ static int terminal_execute(VimState *state, int key)
case K_EVENT:
// We cannot let an event free the terminal yet. It is still needed.
s->term->refcount++;
- queue_process_events(loop.events);
+ queue_process_events(main_loop.events);
s->term->refcount--;
if (s->term->buf_handle == 0) {
s->close = true;