0
0
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00

patch 8.2.2446: setting 'term' empty has different error if compiled with GUI

Problem:    Setting 'term' empty has different error if compiled with GUI.
Solution:   Insert "else". (closes #7766)
This commit is contained in:
Bram Moolenaar
2021-02-01 18:39:47 +01:00
parent 0346b799fc
commit 5daa911626
3 changed files with 4 additions and 4 deletions

View File

@@ -687,7 +687,7 @@ did_set_string_option(
if (T_NAME[0] == NUL)
errmsg = N_("E529: Cannot set 'term' to empty string");
#ifdef FEAT_GUI
if (gui.in_use)
else if (gui.in_use)
errmsg = N_("E530: Cannot change term in GUI");
else if (term_is_gui(T_NAME))
errmsg = N_("E531: Use \":gui\" to start the GUI");

View File

@@ -484,12 +484,10 @@ func Test_set_ttytype()
set ttytype=xterm
call assert_equal('xterm', &ttytype)
call assert_equal(&ttytype, &term)
" "set ttytype=" gives E522 instead of E529
" in travis on some builds. Why? Catch both for now
try
set ttytype=
call assert_report('set ttytype= did not fail')
catch /E529\|E522/
catch /E529/
endtry
" Some systems accept any terminal name and return dumb settings,

View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
2446,
/**/
2445,
/**/