To: vim_dev@googlegroups.com
Subject: Patch 9.0.1674
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 9.0.1674 (after 9.0.1673)
Problem:    Help for builtin functions is not sorted properly.
Solution:   Put err_teapot() help in the right position.
Files:      runtime/doc/builtin.txt, runtime/doc/usr_41.txt


*** ../vim-9.0.1673/runtime/doc/builtin.txt	2023-07-07 18:57:21.729797124 +0100
--- runtime/doc/builtin.txt	2023-07-07 23:02:07.761995697 +0100
***************
*** 154,162 ****
  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
  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
--- 154,162 ----
  digraph_set({chars}, {digraph})	Boolean	register |digraph|
  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
  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,2190 ****
  <		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
--- 2177,2182 ----
***************
*** 2210,2215 ****
--- 2202,2216 ----
  		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: >
*** ../vim-9.0.1673/runtime/doc/usr_41.txt	2023-05-06 14:08:10.139045046 +0100
--- runtime/doc/usr_41.txt	2023-07-07 23:15:40.279227981 +0100
***************
*** 1231,1236 ****
--- 1232,1238 ----
  	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
*** ../vim-9.0.1673/src/version.c	2023-07-07 18:57:21.733797120 +0100
--- src/version.c	2023-07-07 20:41:34.749626847 +0100
***************
*** 697,698 ****
--- 697,700 ----
  {   /* Add new patch number below this line */
+ /**/
+     1674,
  /**/

-- 
       We're knights of the round table
       We dance whene'er we're able
       We do routines and chorus scenes
       With footwork impeccable.
       We dine well here in Camelot
       We eat ham and jam and spam a lot.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///