diff options
| author | matveyt <matthewtarasov@gmail.com> | 2021-07-23 18:06:01 +0200 |
|---|---|---|
| committer | Björn Linse <bjorn.linse@gmail.com> | 2021-07-23 18:08:40 +0200 |
| commit | 8ce092941862a18a6591f62f398ed9e8bd9202be (patch) | |
| tree | 431fefdeba54043f46cca1a367ce1735983ade8e /src/nvim/main.c | |
| parent | 6f48c018b526a776e38e94f58769c30141de9e0c (diff) | |
| download | rneovim-8ce092941862a18a6591f62f398ed9e8bd9202be.tar.gz rneovim-8ce092941862a18a6591f62f398ed9e8bd9202be.tar.bz2 rneovim-8ce092941862a18a6591f62f398ed9e8bd9202be.zip | |
Remove EXMODE_NORMAL
Diffstat (limited to 'src/nvim/main.c')
| -rw-r--r-- | src/nvim/main.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c index 909defe6d0..d6eedf7010 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -318,7 +318,8 @@ int main(int argc, char **argv) debug_break_level = params.use_debug_break_level; // Read ex-commands if invoked with "-es". - if (!params.input_isatty && silent_mode && exmode_active == EXMODE_NORMAL) { + if (!params.input_isatty && !params.input_neverscript + && silent_mode && exmode_active) { input_start(STDIN_FILENO); } @@ -764,7 +765,7 @@ static bool edit_stdin(bool explicit, mparm_T *parmp) { bool implicit = !headless_mode && !embedded_mode - && exmode_active != EXMODE_NORMAL // -E/-Es but not -e/-es. + && (!exmode_active || parmp->input_neverscript) && !parmp->input_isatty && scriptin[0] == NULL; // `-s -` was not given. return explicit || implicit; @@ -907,11 +908,12 @@ static void command_line_scan(mparm_T *parmp) break; } case 'e': { // "-e" Ex mode - exmode_active = EXMODE_NORMAL; + exmode_active = true; break; } case 'E': { // "-E" Ex mode - exmode_active = EXMODE_VIM; + exmode_active = true; + parmp->input_neverscript = true; break; } case 'f': { // "-f" GUI: run in foreground. |