summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2023-07-07 23:19:18 +0100
committerBram Moolenaar <Bram@vim.org>2023-07-07 23:19:18 +0100
commit416bd916b4cc4502eb734218f406e4edd8dd199c (patch)
treeb335edc773f697cf5deb49416baa0fed241fd953
parent80adaa8ae8398403ca4e9797219ea9a501fc76a5 (diff)
patch 9.0.1674: help for builtin functions is not sorted properlyv9.0.1674
Problem: Help for builtin functions is not sorted properly. Solution: Put err_teapot() help in the right position.
-rw-r--r--runtime/doc/builtin.txt19
-rw-r--r--runtime/doc/usr_41.txt1
-rw-r--r--src/version.c2
3 files changed, 13 insertions, 9 deletions
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 7fb1a435c3..e7a0392cc8 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -154,9 +154,9 @@ digraph_getlist([{listall}]) List get all |digraph|s
digraph_set({chars}, {digraph}) Boolean register |digraph|
digraph_setlist({digraphlist}) Boolean register multiple |digraph|s
echoraw({expr}) none output {expr} as-is
-err_teapot() Number produce error 418
empty({expr}) Number |TRUE| if {expr} is empty
environ() Dict return environment variables
+err_teapot() Number produce error 418
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
@@ -2177,14 +2177,6 @@ echoraw({string}) *echoraw()*
< Use with care, you can mess up the terminal this way.
-err_teapot([{expr}]) *err_teapot()*
- Produce an error with number 418, needed for implementation of
- RFC 2325.
- If {expr} is present and it is TRUE error 503 is given,
- indicating that coffee is temporarily not available.
- If {expr} is present it must be a String.
-
-
empty({expr}) *empty()*
Return the Number 1 if {expr} is empty, zero otherwise.
- A |List| or |Dictionary| is empty when it does not have any
@@ -2210,6 +2202,15 @@ environ() *environ()*
use this: >
:echo index(keys(environ()), 'HOME', 0, 1) != -1
+
+err_teapot([{expr}]) *err_teapot()*
+ Produce an error with number 418, needed for implementation of
+ RFC 2325.
+ If {expr} is present and it is TRUE error 503 is given,
+ indicating that coffee is temporarily not available.
+ If {expr} is present it must be a String.
+
+
escape({string}, {chars}) *escape()*
Escape the characters in {chars} that occur in {string} with a
backslash. Example: >
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index 2d89e46e4f..2d6792af47 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -1232,6 +1232,7 @@ Inter-process communication: *channel-functions*
json_decode() decode a JSON string to Vim types
js_encode() encode an expression to a JSON string
js_decode() decode a JSON string to Vim types
+ err_teapot() give error 418 or 503
Jobs: *job-functions*
job_start() start a job
diff --git a/src/version.c b/src/version.c
index 840f338560..cf845141e0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1674,
+/**/
1673,
/**/
1672,