aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/main.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2017-08-06 04:25:55 +0200
committerGitHub <noreply@github.com>2017-08-06 04:25:55 +0200
commit5bec94652c9dd1d8cab260c4dd10e44d3f38f3cd (patch)
treefc61484a30532ef89f24c5b60534dccc56408d17 /src/nvim/main.c
parent55c0401dfd137a5e173d8551f763cb4c6fed56e1 (diff)
parent3827d5bc713d9ed149bc793f411debb5b89a4eba (diff)
downloadrneovim-5bec94652c9dd1d8cab260c4dd10e44d3f38f3cd.tar.gz
rneovim-5bec94652c9dd1d8cab260c4dd10e44d3f38f3cd.tar.bz2
rneovim-5bec94652c9dd1d8cab260c4dd10e44d3f38f3cd.zip
Merge #7110 from justinmk/preserve-wildmenu
Diffstat (limited to 'src/nvim/main.c')
-rw-r--r--src/nvim/main.c15
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 */