patch 9.0.1727: minor problems with the teapot

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>

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 2f6961d7dc7be58bb2b04ac053729735ea338fb0..6a5ec1bacb74d58711f141ea423e58efbb626b76 100644 (file)
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -156,7 +156,7 @@ digraph_setlist({digraphlist})      Boolean register multiple |digraph|s
 echoraw({expr})                        none    output {expr} as-is
 empty({expr})                  Number  |TRUE| if {expr} is empty
 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 '\'
 eval({string})                 any     evaluate {string} into its value
 eventhandler()                 Number  |TRUE| if inside an event handler

diff --git a/src/evalfunc.c b/src/evalfunc.c
index ab6606f76fd9374f4c6f70679c020fcf171e71e9..ef0414c6898396d319457b90fc74fe7a0cc06560 100644 (file)
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -3936,7 +3936,7 @@ f_err_teapot(typval_T *argvars, typval_T *rettv UNUSED)
        if (argvars[0].v_type == VAR_STRING)
        {
            char_u *s = tv_get_string_strict(&argvars[0]);
-           if (s == NULL || *skipwhite(s) == NUL)
+           if (*skipwhite(s) == NUL)
                return;
        }
 

diff --git a/src/version.c b/src/version.c
index 0661b279ba2604c4e35a2b99338bedd4facc7cf3..b9e584d2059ea7cdccc07a97b92a4f636d8f2681 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1727,
 /**/
     1726,
 /**/