Skip to content

Commit 416bd91

Browse files
committed
patch 9.0.1674: help for builtin functions is not sorted properly
Problem: Help for builtin functions is not sorted properly. Solution: Put err_teapot() help in the right position.
1 parent 80adaa8 commit 416bd91

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

runtime/doc/builtin.txt

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,9 @@ digraph_getlist([{listall}]) List get all |digraph|s
154154
digraph_set({chars}, {digraph}) Boolean register |digraph|
155155
digraph_setlist({digraphlist}) Boolean register multiple |digraph|s
156156
echoraw({expr}) none output {expr} as-is
157-
err_teapot() Number produce error 418
158157
empty({expr}) Number |TRUE| if {expr} is empty
159158
environ() Dict return environment variables
159+
err_teapot() Number produce error 418
160160
escape({string}, {chars}) String escape {chars} in {string} with '\'
161161
eval({string}) any evaluate {string} into its value
162162
eventhandler() Number |TRUE| if inside an event handler
@@ -2177,14 +2177,6 @@ echoraw({string}) *echoraw()*
21772177
< Use with care, you can mess up the terminal this way.
21782178

21792179

2180-
err_teapot([{expr}]) *err_teapot()*
2181-
Produce an error with number 418, needed for implementation of
2182-
RFC 2325.
2183-
If {expr} is present and it is TRUE error 503 is given,
2184-
indicating that coffee is temporarily not available.
2185-
If {expr} is present it must be a String.
2186-
2187-
21882180
empty({expr}) *empty()*
21892181
Return the Number 1 if {expr} is empty, zero otherwise.
21902182
- A |List| or |Dictionary| is empty when it does not have any
@@ -2210,6 +2202,15 @@ environ() *environ()*
22102202
use this: >
22112203
:echo index(keys(environ()), 'HOME', 0, 1) != -1
22122204
2205+
2206+
err_teapot([{expr}]) *err_teapot()*
2207+
Produce an error with number 418, needed for implementation of
2208+
RFC 2325.
2209+
If {expr} is present and it is TRUE error 503 is given,
2210+
indicating that coffee is temporarily not available.
2211+
If {expr} is present it must be a String.
2212+
2213+
22132214
escape({string}, {chars}) *escape()*
22142215
Escape the characters in {chars} that occur in {string} with a
22152216
backslash. Example: >

runtime/doc/usr_41.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1232,6 +1232,7 @@ Inter-process communication: *channel-functions*
12321232
json_decode() decode a JSON string to Vim types
12331233
js_encode() encode an expression to a JSON string
12341234
js_decode() decode a JSON string to Vim types
1235+
err_teapot() give error 418 or 503
12351236

12361237
Jobs: *job-functions*
12371238
job_start() start a job

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,8 @@ static char *(features[]) =
695695

696696
static int included_patches[] =
697697
{ /* Add new patch number below this line */
698+
/**/
699+
1674,
698700
/**/
699701
1673,
700702
/**/

0 commit comments

Comments
 (0)