aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/main.c4
-rw-r--r--src/nvim/po/fr.po3
2 files changed, 7 insertions, 0 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c
index e7835ccbf1..be1f08bb46 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -1223,6 +1223,10 @@ scripterror:
}
}
+ if (embedded_mode && silent_mode) {
+ mainerr(_("--embed conflicts with -es/-Es"), NULL);
+ }
+
// If there is a "+123" or "-c" command, set v:swapcommand to the first one.
if (parmp->n_commands > 0) {
const size_t swcmd_len = STRLEN(parmp->commands[0]) + 3;
diff --git a/src/nvim/po/fr.po b/src/nvim/po/fr.po
index 5c4c154654..ea6fe302fe 100644
--- a/src/nvim/po/fr.po
+++ b/src/nvim/po/fr.po
@@ -7403,3 +7403,6 @@ msgstr ""
"Source C (*.c, *.h)\t*.c;*.h\n"
"Source C++ (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
"Fichiers Vim (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+
+msgid "--embed conflicts with -es/-Es"
+msgstr "les paramètres -es/-ES sont incompatibles avec --embed"