thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.0.1727: minor problems with the teapot

Browse Source 
Problem: minor problems with the teapot()
Solution: remove the null check, update documentation

Update the builtin-function-list entry. (It implicitly returns 0, but such
functions usually use "none")

Also, tv_get_string_strict() can not return NULL, so remove that check

closes: #12647

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Sean Dewar <seandewar@users.noreply.github.com>
This commit is contained in:
Sean Dewar
2023-07-08 10:35:19 +01:00
committed by Christian Brabandt
parent 876f5fb570
commit b0efa49ed1
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/doc/builtin.txt
View File

@@ -156,7 +156,7 @@ digraph_setlist({digraphlist}) Boolean register multiple |digraph|s
echoraw({expr}) none output {expr} as-is echoraw({expr}) none output {expr} as-is
empty({expr}) Number |TRUE| if {expr} is empty empty({expr}) Number |TRUE| if {expr} is empty
environ() Dict return environment variables environ() Dict return environment variables
err_teapot() Number produce error 418 err_teapot([{expr}]) none give E418, or E503 if {expr} is |TRUE|
escape({string}, {chars}) String escape {chars} in {string} with '\' escape({string}, {chars}) String escape {chars} in {string} with '\'
eval({string}) any evaluate {string} into its value eval({string}) any evaluate {string} into its value
eventhandler() Number |TRUE| if inside an event handler eventhandler() Number |TRUE| if inside an event handler

2
src/evalfunc.c
View File

@@ -3936,7 +3936,7 @@ f_err_teapot(typval_T *argvars, typval_T *rettv UNUSED)
if (argvars[0].v_type == VAR_STRING) if (argvars[0].v_type == VAR_STRING)
{ {
char_u *s = tv_get_string_strict(&argvars[0]); char_u *s = tv_get_string_strict(&argvars[0]);
if (s == NULL || *skipwhite(s) == NUL) if (*skipwhite(s) == NUL)
return; return;
} }

2
src/version.c
View File

@@ -695,6 +695,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 */
/**/
1727,
/**/ /**/
1726, 1726,
/**/ /**/