Merge remote-tracking branch 'upstream/master' into colorcolcharcolorcolchar

1 files changed, 78 insertions, 18 deletions

diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt
index 1bdd13ac0c..0a07f06c75 100644
--- a/runtime/doc/deprecated.txt
+++ b/runtime/doc/deprecated.txt
@@ -15,8 +15,18 @@ Deprecated features
 API
 - *nvim_buf_clear_highlight()*	Use |nvim_buf_clear_namespace()| instead.
 - *nvim_buf_set_virtual_text()*	Use |nvim_buf_set_extmark()| instead.
-- *nvim_command_output()*	Use |nvim_exec()| instead.
+- *nvim_command_output()*	Use |nvim_exec2()| instead.
 - *nvim_execute_lua()*		Use |nvim_exec_lua()| instead.
+- *nvim_get_hl_by_name()*	Use |nvim_get_hl()| instead.
+- *nvim_get_hl_by_id()*		Use |nvim_get_hl()| instead.
+- *nvim_exec()*			Use |nvim_exec2()| instead.
+- *nvim_get_option_info()*	Use |nvim_get_option_info2()| instead.
+- *nvim_buf_get_option()*	Use |nvim_get_option_value()| instead.
+- *nvim_buf_set_option()*	Use |nvim_set_option_value()| instead.
+- *nvim_get_option()*		Use |nvim_get_option_value()| instead.
+- *nvim_set_option()*		Use |nvim_set_option_value()| instead.
+- *nvim_win_get_option()*	Use |nvim_get_option_value()| instead.
+- *nvim_win_set_option()*	Use |nvim_set_option_value()| instead.
 
 COMMANDS
 - *:rv* *:rviminfo*		Deprecated alias to |:rshada| command.
@@ -50,11 +60,11 @@ FUNCTIONS
 - *buffer_name()*	Obsolete name for |bufname()|.
 - *buffer_number()*	Obsolete name for |bufnr()|.
 - *file_readable()*	Obsolete name for |filereadable()|.
-- *health#report_error*	Use Lua |vim.health.report_error()| instead.
-- *health#report_info*	Use Lua |vim.health.report_info()| instead.
-- *health#report_ok*	Use Lua |vim.health.report_ok()| instead.
-- *health#report_start*	Use Lua |vim.health.report_start()| instead.
-- *health#report_warn*	Use Lua |vim.health.report_warn()| instead.
+- *health#report_error* *vim.health.report_error()*	Use |vim.health.error()| instead.
+- *health#report_info* *vim.health.report_info()*	Use |vim.health.info()| instead.
+- *health#report_ok* *vim.health.report_ok()*		Use |vim.health.ok()| instead.
+- *health#report_start* *vim.health.report_start()*	Use |vim.health.start()| instead.
+- *health#report_warn* *vim.health.report_warn()*	Use |vim.health.warn()| instead.
 - *highlight_exists()*	Obsolete name for |hlexists()|.
 - *highlightID()*	Obsolete name for |hlID()|.
 - *inputdialog()*	Use |input()| instead.
@@ -107,20 +117,53 @@ internally and are no longer exposed as part of the API. Instead, use
 - *vim.lsp.diagnostic.set_virtual_text()*
 
 LSP FUNCTIONS
-- *vim.lsp.buf.range_code_action()*	Use |vim.lsp.buf.code_action()| with
-					the `range` parameter.
-- *vim.lsp.util.diagnostics_to_items()*	Use |vim.diagnostic.toqflist()| instead.
-- *vim.lsp.util.set_qflist()*		Use |setqflist()| instead.
-- *vim.lsp.util.set_loclist()*		Use |setloclist()| instead.
-- *vim.lsp.buf_get_clients()*		Use |vim.lsp.get_active_clients()| with
-                                        {buffer = bufnr} instead.
-- *vim.lsp.buf.formatting()*		Use |vim.lsp.buf.format()| with
-					{async = true} instead.
-- *vim.lsp.buf.range_formatting()*	Use |vim.lsp.formatexpr()|
-					or |vim.lsp.buf.format()| instead.
+- *vim.lsp.buf.server_ready()*
+  Use |LspAttach| instead, depending on your use-case. "Server ready" is not
+  part of the LSP spec, so the Nvim LSP client cannot meaningfully implement
+  it. "Ready" is ambiguous because:
+  - Language servers may finish analyzing the workspace, but edits can always
+    re-trigger analysis/builds.
+  - Language servers can serve some requests even while processing changes.
+- *vim.lsp.buf.range_code_action()*		Use |vim.lsp.buf.code_action()| with
+						the `range` parameter.
+- *vim.lsp.util.diagnostics_to_items()*		Use |vim.diagnostic.toqflist()| instead.
+- *vim.lsp.util.set_qflist()*			Use |setqflist()| instead.
+- *vim.lsp.util.set_loclist()*			Use |setloclist()| instead.
+- *vim.lsp.buf_get_clients()*			Use |vim.lsp.get_clients()| with
+						{buffer=bufnr} instead.
+- *vim.lsp.buf.formatting()*			Use |vim.lsp.buf.format()| with
+						{async=true} instead.
+- *vim.lsp.buf.formatting_sync()*		Use |vim.lsp.buf.format()| with
+						{async=false} instead.
+- *vim.lsp.buf.range_formatting()*		Use |vim.lsp.formatexpr()|
+						or |vim.lsp.buf.format()| instead.
+- *vim.lsp.util.get_progress_messages()*	Use |vim.lsp.status()| or access
+						`progress` of |vim.lsp.client|
+- *vim.lsp.get_active_clients()*		Use |vim.lsp.get_clients()|
+- *vim.lsp.for_each_buffer_client()*		Use |vim.lsp.get_clients()|
+- *vim.lsp.util.trim_empty_lines()*		Use |vim.split()| with `trimempty` instead.
+- *vim.lsp.util.try_trim_markdown_code_blocks()*
+- *vim.lsp.util.set_lines()*
+- *vim.lsp.util.extract_completion_items()*
+- *vim.lsp.util.parse_snippet()*
+- *vim.lsp.util.text_document_completion_list_to_complete_items()*
+
+TREESITTER FUNCTIONS
+- *vim.treesitter.language.require_language()*	Use |vim.treesitter.language.add()|
+						instead.
+- *vim.treesitter.get_node_at_pos()*		Use |vim.treesitter.get_node()|
+						instead.
+- *vim.treesitter.get_node_at_cursor()*		Use |vim.treesitter.get_node()|
+						and |TSNode:type()| instead.
+- *vim.treesitter.query.get_query()*		Use |vim.treesitter.query.get()|
+						instead.
+- *LanguageTree:for_each_child()*		Use |LanguageTree:children()|
+						(non-recursive) instead.
 
 LUA
-- *vim.register_keystroke_callback()* 	Use |vim.on_key()| instead.
+- vim.register_keystroke_callback()	Use |vim.on_key()| instead.
+- *vim.pretty_print()*			Use |vim.print()| instead.
+- *vim.loop*				Use |vim.uv| instead.
 
 NORMAL COMMANDS
 - *]f* *[f*		Same as "gf".
@@ -137,6 +180,21 @@ OPTIONS
 - 'viewoptions'		Flags "unix", "slash" are ignored and always enabled.
 - *'viminfo'*		Deprecated alias to 'shada' option.
 - *'viminfofile'*	Deprecated alias to 'shadafile' option.
+- *'paste'* *'nopaste'*	Just Paste It.™  The 'paste' option is obsolete:
+			|paste| is handled automatically when you paste text
+			using your terminal's or GUI's paste feature
+			(CTRL-SHIFT-v, CMD-v (macOS), middle-click, …).
+			Enables "paste mode":
+			  - Disables mappings in Insert, Cmdline mode.
+			  - Disables abbreviations.
+			  - Resets 'autoindent' 'expandtab' 'revins' 'ruler'
+			    'showmatch' 'smartindent' 'smarttab' 'softtabstop'
+			    'textwidth' 'wrapmargin'.
+			  - Treats 'formatoptions' as empty.
+			  - Disables the effect of these options:
+			    - 'cindent'
+			    - 'indentexpr'
+			    - 'lisp'
 
 UI EXTENSIONS
 - *ui-wildmenu*		Use |ui-cmdline| with |ui-popupmenu| instead. Enabled
@@ -144,6 +202,8 @@ UI EXTENSIONS
 			- `["wildmenu_show", items]`
 			- `["wildmenu_select", selected]`
 			- `["wildmenu_hide"]`
+- *term_background*	Unused. The terminal background color is now detected
+			by the Nvim core directly instead of the TUI.
 
 VARIABLES
 - *b:terminal_job_pid*	PID of the top-level process in a |:terminal|.