diff options
| author | glacambre <code@lacamb.re> | 2019-08-12 16:44:53 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2019-09-13 15:15:59 -0700 |
| commit | 77594d55f7092cf4f2baacc067eb41ad96e65398 (patch) | |
| tree | f32bd8907c21d771f296eeec27b4d7de3d5fd1a9 /src | |
| parent | 3afb397407af3c94fc82d694186e8d451e625237 (diff) | |
| download | rneovim-77594d55f7092cf4f2baacc067eb41ad96e65398.tar.gz rneovim-77594d55f7092cf4f2baacc067eb41ad96e65398.tar.bz2 rneovim-77594d55f7092cf4f2baacc067eb41ad96e65398.zip | |
startup: fail if --embed with -es/-Es #10753
Closes https://github.com/neovim/neovim/issues/10031
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/main.c | 4 | ||||
| -rw-r--r-- | src/nvim/po/fr.po | 3 |
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" |