diff options
author | Thiago de Arruda <tpadilha84@gmail.com> | 2015-08-21 13:38:11 -0300 |
---|---|---|
committer | Thiago de Arruda <tpadilha84@gmail.com> | 2015-08-21 13:38:11 -0300 |
commit | c75d5010b742db83462fc4508cf6dba455f79ca7 (patch) | |
tree | fd9cc6bd7e8a3eb4aa4f33226225efd660702e90 /src/nvim/main.c | |
parent | d5b5063622ab9764a851fdf56c60d14ad0736583 (diff) | |
parent | 3d2d44037f27104207005998d9bcb55af1152892 (diff) | |
download | rneovim-c75d5010b742db83462fc4508cf6dba455f79ca7.tar.gz rneovim-c75d5010b742db83462fc4508cf6dba455f79ca7.tar.bz2 rneovim-c75d5010b742db83462fc4508cf6dba455f79ca7.zip |
Merge PR #3210 'Bugfixes'
Helped-by: oni-link <knil.ino@gmail.com>
Reviewed-by: oni-link <knil.ino@gmail.com>
Diffstat (limited to 'src/nvim/main.c')
-rw-r--r-- | src/nvim/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c index e11db16c61..9af15924bd 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -245,6 +245,7 @@ int main(int argc, char **argv) set_vim_var_string(VV_PROGPATH, (char_u *)argv[0], -1); set_vim_var_string(VV_PROGNAME, path_tail((char_u *)argv[0]), -1); + event_init(); /* * Process the command line arguments. File names are put in the global * argument list "global_alist". @@ -275,7 +276,6 @@ int main(int argc, char **argv) if (GARGCOUNT > 1 && !silent_mode) printf(_("%d files to edit\n"), GARGCOUNT); - event_init(); full_screen = true; t_colors = 256; check_tty(¶ms); @@ -963,6 +963,7 @@ static void command_line_scan(mparm_T *parmp) } else if (STRICMP(argv[0] + argv_idx, "embed") == 0) { embedded_mode = true; parmp->headless = true; + channel_from_stdio(); } else if (STRNICMP(argv[0] + argv_idx, "literal", 7) == 0) { #if !defined(UNIX) parmp->literal = TRUE; |