aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.3748: giving an error for an empty sign argument breaks a plugin

Browse Source 
Problem:    Giving an error for an empty sign argument breaks a plugin.
Solution:   Do not give an error.
This commit is contained in:
Bram Moolenaar 2021-12-05 19:10:04 +00:00
parent 0bac5fc5e1
commit e5710a02cb
4 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/errors.h
View File

@ -694,5 +694,3 @@ EXTERN char e_line_number_out_of_range[]
INIT(= N_("E1247: Line number out of range")); INIT(= N_("E1247: Line number out of range"));
EXTERN char e_closure_called_from_invalid_context[] EXTERN char e_closure_called_from_invalid_context[]
INIT(= N_("E1248: Closure called from invalid context")); INIT(= N_("E1248: Closure called from invalid context"));
EXTERN char e_group_name_missing_for_str[]
INIT(= N_("E1249: Group name missing for %s"));

30
src/sign.c
View File

@ -1310,17 +1310,6 @@ sign_jump(int sign_id, char_u *sign_group, buf_T *buf)
return lnum; return lnum;
} }
static int
check_empty_group(size_t len, char *name)
{
if (len == 0)
{
semsg(_(e_group_name_missing_for_str), name);
return FAIL;
}
return OK;
}
/* /*
* ":sign define {name} ..." command * ":sign define {name} ..." command
*/ */
@ -1335,10 +1324,6 @@ sign_define_cmd(char_u *sign_name, char_u *cmdline)
char_u *texthl = NULL; char_u *texthl = NULL;
char_u *culhl = NULL; char_u *culhl = NULL;
int failed = FALSE; int failed = FALSE;
sign_T *sp_prev;
int exists;
exists = sign_find(sign_name, &sp_prev) != NULL;
// set values for a defined sign. // set values for a defined sign.
for (;;) for (;;)
@ -1360,31 +1345,16 @@ sign_define_cmd(char_u *sign_name, char_u *cmdline)
else if (STRNCMP(arg, "linehl=", 7) == 0) else if (STRNCMP(arg, "linehl=", 7) == 0)
{ {
arg += 7; arg += 7;
if (!exists && check_empty_group(p - arg, "linehl") == FAIL)
{
failed = TRUE;
break;
}
linehl = vim_strnsave(arg, p - arg); linehl = vim_strnsave(arg, p - arg);
} }
else if (STRNCMP(arg, "texthl=", 7) == 0) else if (STRNCMP(arg, "texthl=", 7) == 0)
{ {
arg += 7; arg += 7;
if (!exists && check_empty_group(p - arg, "texthl") == FAIL)
{
failed = TRUE;
break;
}
texthl = vim_strnsave(arg, p - arg); texthl = vim_strnsave(arg, p - arg);
} }
else if (STRNCMP(arg, "culhl=", 6) == 0) else if (STRNCMP(arg, "culhl=", 6) == 0)
{ {
arg += 6; arg += 6;
if (!exists && check_empty_group(p - arg, "culhl") == FAIL)
{
failed = TRUE;
break;
}
culhl = vim_strnsave(arg, p - arg); culhl = vim_strnsave(arg, p - arg);
} }
else else

5
src/testdir/test_signs.vim
View File

@ -126,11 +126,6 @@ func Test_sign()
call assert_fails("sign define Sign4 text= linehl=Comment", 'E239:') call assert_fails("sign define Sign4 text= linehl=Comment", 'E239:')
call assert_fails("sign define Sign4 text=\\ ab linehl=Comment", 'E239:') call assert_fails("sign define Sign4 text=\\ ab linehl=Comment", 'E239:')
" an empty highlight argument for a new sign is an error
call assert_fails("sign define SignX linehl=", 'E1249: Group name missing for linehl')
call assert_fails("sign define SignX culhl=", 'E1249: Group name missing for culhl')
call assert_fails("sign define SignX texthl=", 'E1249: Group name missing for texthl')
" an empty highlight argument for an existing sign clears it " an empty highlight argument for an existing sign clears it
sign define SignY texthl=TextHl culhl=CulHl linehl=LineHl sign define SignY texthl=TextHl culhl=CulHl linehl=LineHl
let sl = sign_getdefined('SignY')[0] let sl = sign_getdefined('SignY')[0]

2
src/version.c
View File

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