From 5daa91162699e4f8b54f9d1caaaab2715038941c Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 1 Feb 2021 18:39:47 +0100 Subject: 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) --- src/optionstr.c | 2 +- src/testdir/test_options.vim | 4 +--- src/version.c | 2 ++ 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/optionstr.c b/src/optionstr.c index 8f3f0c5edc..c8a5b0c658 100644 --- a/src/optionstr.c +++ b/src/optionstr.c @@ -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"); diff --git a/src/testdir/test_options.vim b/src/testdir/test_options.vim index cc02c5c7ca..c8b2700dda 100644 --- a/src/testdir/test_options.vim +++ b/src/testdir/test_options.vim @@ -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, diff --git a/src/version.c b/src/version.c index 9fa14cbe87..bba9da818f 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2446, /**/ 2445, /**/ -- cgit v1.2.3