aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2023-07-06 04:05:13 -0700
committerGitHub <noreply@github.com>2023-07-06 04:05:13 -0700
commit06c4edf46bf65ec6b540de355cf1a691533f1df9 (patch)
tree99140c8bdbbcf5eded0072fc6418ac41579f84dd /runtime/doc
parent4e34ca8ae71d7dfac5c93ffe8e4e8d00f915c593 (diff)
parentf39ca5df232cb6e70b1932b7444840acf42cf87b (diff)
downloadrneovim-06c4edf46bf65ec6b540de355cf1a691533f1df9.tar.gz
rneovim-06c4edf46bf65ec6b540de355cf1a691533f1df9.tar.bz2
rneovim-06c4edf46bf65ec6b540de355cf1a691533f1df9.zip
Merge #21677 fix(defaults): visual star (*,#) is fragile
Diffstat (limited to 'runtime/doc')
-rw-r--r--runtime/doc/lua.txt2
-rw-r--r--runtime/doc/vim_diff.txt18
2 files changed, 10 insertions, 10 deletions
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 77a89a123d..ca4adbce9c 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1408,7 +1408,7 @@ deprecate({name}, {alternative}, {version}, {plugin}, {backtrace})
• {backtrace} boolean|nil Prints backtrace. Defaults to true.
Return: ~
- Deprecated message, or nil if no message was shown.
+ (string|nil) # Deprecated message, or nil if no message was shown.
inspect({object}, {options}) *vim.inspect()*
Gets a human-readable representation of the given object.
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 686905537d..6ffd45d013 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -114,15 +114,15 @@ DEFAULT MAPPINGS
*default-mappings*
Nvim creates the following default mappings at |startup|. You can disable any
of these in your config by simply removing the mapping, e.g. ":unmap Y".
->vim
- nnoremap Y y$
- nnoremap <C-L> <Cmd>nohlsearch<Bar>diffupdate<Bar>normal! <C-L><CR>
- inoremap <C-U> <C-G>u<C-U>
- inoremap <C-W> <C-G>u<C-W>
- xnoremap * y/\V<C-R>"<CR>
- xnoremap # y?\V<C-R>"<CR>
- nnoremap & :&&<CR>
-<
+
+- |Y-default|
+- |i_CTRL-U-default|
+- |i_CTRL-W-default|
+- |CTRL-L-default|
+- |&-default|
+- |v_#-default|
+- |v_star-default|
+
DEFAULT AUTOCOMMANDS
*default-autocmds*
Default autocommands exist in the following groups. Use ":autocmd! {group}" to