diff options
author | ZyX <kp-pav@yandex.ru> | 2017-08-06 15:25:17 +0300 |
---|---|---|
committer | ZyX <kp-pav@yandex.ru> | 2017-08-06 15:25:17 +0300 |
commit | 474aa823dc5680b06dc84cd2ae248e58b6e83359 (patch) | |
tree | 1714a0878caecff1f3d9d69228c888728c824d15 /src/nvim/main.c | |
parent | 36acfce4eac9dd131a39c4dbdff2836ab3e21d73 (diff) | |
parent | 5bec94652c9dd1d8cab260c4dd10e44d3f38f3cd (diff) | |
download | rneovim-474aa823dc5680b06dc84cd2ae248e58b6e83359.tar.gz rneovim-474aa823dc5680b06dc84cd2ae248e58b6e83359.tar.bz2 rneovim-474aa823dc5680b06dc84cd2ae248e58b6e83359.zip |
Merge branch 'master' into colored-cmdline
Diffstat (limited to 'src/nvim/main.c')
-rw-r--r-- | src/nvim/main.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c index 7dcf00c26b..a46c1a58f8 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -98,10 +98,8 @@ typedef struct { bool input_isatty; // stdin is a terminal bool output_isatty; // stdout is a terminal bool err_isatty; // stderr is a terminal - bool headless; // Dont try to start an user interface - // or read/write to stdio(unless - // embedding) - int no_swap_file; /* "-n" argument used */ + bool headless; // Do not start the builtin UI. + int no_swap_file; // "-n" argument used int use_debug_break_level; int window_count; /* number of windows to use */ int window_layout; /* 0, WIN_HOR, WIN_VER or WIN_TABS */ @@ -932,10 +930,11 @@ static void command_line_scan(mparm_T *parmp) break; case 's': - if (exmode_active) /* "-s" silent (batch) mode */ - silent_mode = TRUE; - else /* "-s {scriptin}" read from script file */ - want_argument = TRUE; + if (exmode_active) { // "-es" silent (batch) mode + silent_mode = true; + } else { // "-s {scriptin}" read from script file + want_argument = true; + } break; case 't': /* "-t {tag}" or "-t{tag}" jump to tag */ |