mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-16 16:28:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14311 from matveyt/nomode_ce

Browse Source 
refactor(state): Remove EXMODE_NORMAL
This commit is contained in:
Björn Linse
2021-07-25 19:35:23 +02:00
committed by GitHub
parent f15c745502 8ce0929418
commit 192adfe99f
17 changed files with 50 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/main.c
View File

@@ -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.