aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2019-04-10 03:27:25 +0200
committerGitHub <noreply@github.com>2019-04-10 03:27:25 +0200
commitddd0eb6f5120a09b97867d2561ea61309038ccd2 (patch)
tree78ba762f7f99840c318f128a73ee6f0e5477968f /src
parent9daa7d9978ac0249b61e823808cabbcbc997d5c7 (diff)
downloadrneovim-ddd0eb6f5120a09b97867d2561ea61309038ccd2.tar.gz
rneovim-ddd0eb6f5120a09b97867d2561ea61309038ccd2.tar.bz2
rneovim-ddd0eb6f5120a09b97867d2561ea61309038ccd2.zip
startup: -es/-Es (silent/batch mode): skip swapfile #8540
To use Nvim as a scripting engine the side-effects of swapfiles and user config should be avoided by default.
Diffstat (limited to 'src')
-rw-r--r--src/nvim/main.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c
index 48feeea669..331cfc9f61 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"
@@ -807,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
@@ -990,6 +991,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;
}