diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2021-07-25 19:35:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-25 19:35:23 +0200 |
| commit | 192adfe99f33778a85e11fbfdceb37f347a3d235 (patch) | |
| tree | 529e922ff73a8907df3538ac25f0efb685348f6b /src/nvim/main.c | |
| parent | f15c74550252a553eaecb3f55af60d7f7ae27540 (diff) | |
| parent | 8ce092941862a18a6591f62f398ed9e8bd9202be (diff) | |
| download | rneovim-192adfe99f33778a85e11fbfdceb37f347a3d235.tar.gz rneovim-192adfe99f33778a85e11fbfdceb37f347a3d235.tar.bz2 rneovim-192adfe99f33778a85e11fbfdceb37f347a3d235.zip | |
Merge pull request #14311 from matveyt/nomode_ce
refactor(state): 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 95cb53df43..ed40da5866 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); } @@ -769,7 +770,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; @@ -912,11 +913,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. |