diff options
Diffstat (limited to 'src/nvim/main.c')
| -rw-r--r-- | src/nvim/main.c | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c index 5dffca95a2..4e1c7dff57 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -114,12 +114,12 @@ typedef struct { char *listen_addr; // --listen {address} } mparm_T; -/* Values for edit_type. */ -#define EDIT_NONE 0 /* no edit type yet */ -#define EDIT_FILE 1 /* file name argument[s] given, use argument list */ -#define EDIT_STDIN 2 /* read file from stdin */ -#define EDIT_TAG 3 /* tag name argument given, use tagname */ -#define EDIT_QF 4 /* start in quickfix mode */ +// Values for edit_type. +#define EDIT_NONE 0 // no edit type yet +#define EDIT_FILE 1 // file name argument[s] given, use argument list +#define EDIT_STDIN 2 // read file from stdin +#define EDIT_TAG 3 // tag name argument given, use tagname +#define EDIT_QF 4 // start in quickfix mode #ifdef INCLUDE_GENERATED_DECLARATIONS # include "main.c.generated.h" @@ -547,10 +547,11 @@ int main(int argc, char **argv) if (params.n_commands > 0) exe_commands(¶ms); + starting = 0; + RedrawingDisabled = 0; redraw_all_later(NOT_VALID); - no_wait_return = FALSE; - starting = 0; + no_wait_return = false; // 'autochdir' has been postponed. do_autochdir(); @@ -806,6 +807,7 @@ static void command_line_scan(mparm_T *parmp) if (exmode_active) { // "nvim -e -" silent mode silent_mode = true; + parmp->no_swap_file = true; } else { if (parmp->edit_type != EDIT_NONE && parmp->edit_type != EDIT_FILE @@ -869,6 +871,9 @@ static void command_line_scan(mparm_T *parmp) } else if (STRNICMP(argv[0] + argv_idx, "startuptime", 11) == 0) { want_argument = true; argv_idx += 11; + } else if (STRNICMP(argv[0] + argv_idx, "clean", 5) == 0) { + parmp->use_vimrc = "NONE"; + set_option_value("shadafile", 0L, "NONE", 0); } else { if (argv[0][argv_idx]) mainerr(err_opt_unknown, argv[0]); @@ -989,6 +994,7 @@ static void command_line_scan(mparm_T *parmp) case 's': { if (exmode_active) { // "-es" silent (batch) Ex-mode silent_mode = true; + parmp->no_swap_file = true; } else { // "-s {scriptin}" read from script file want_argument = true; } @@ -1126,7 +1132,7 @@ static void command_line_scan(mparm_T *parmp) } case 'i': { // "-i {shada}" use for shada - used_shada_file = argv[0]; + set_option_value("shadafile", 0L, argv[0], 0); break; } @@ -1514,10 +1520,11 @@ static void create_windows(mparm_T *parmp) dorewind = FALSE; curbuf = curwin->w_buffer; if (curbuf->b_ml.ml_mfp == NULL) { - /* Set 'foldlevel' to 'foldlevelstart' if it's not negative. */ - if (p_fdls >= 0) + // Set 'foldlevel' to 'foldlevelstart' if it's not negative.. + if (p_fdls >= 0) { curwin->w_p_fdl = p_fdls; - /* When getting the ATTENTION prompt here, use a dialog */ + } + // When getting the ATTENTION prompt here, use a dialog. swap_exists_action = SEA_DIALOG; set_buflisted(TRUE); |