0
0
mirror of https://github.com/vim/vim.git synced 2025-11-15 23:14:06 -05:00

patch 8.2.0816: terminal test fails when compiled with Athena

Problem:    Terminal test fails when compiled with Athena.
Solution:   Do give an error when the GUI is not running. (hint by Dominique
            Pelle, closes #5928, closes #6132)
This commit is contained in:
Bram Moolenaar
2020-05-24 17:23:45 +02:00
parent 9c65253fe7
commit 87202264f8
6 changed files with 27 additions and 10 deletions

View File

@@ -5308,6 +5308,7 @@ get_job_options(typval_T *tv, jobopt_T *opt, int supported, int supported2)
{
char_u *color_name;
guicolor_T guicolor;
int called_emsg_before = called_emsg;
color_name = tv_get_string_chk(&li->li_tv);
if (color_name == NULL)
@@ -5315,7 +5316,12 @@ get_job_options(typval_T *tv, jobopt_T *opt, int supported, int supported2)
guicolor = GUI_GET_COLOR(color_name);
if (guicolor == INVALCOLOR)
{
if (called_emsg_before == called_emsg)
// may not get the error if the GUI didn't start
semsg(_(e_alloc_color), color_name);
return FAIL;
}
rgb[n] = GUI_MCH_GET_RGB(guicolor);
}