aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2024-03-12 05:39:21 +0800
committerGitHub <noreply@github.com>2024-03-12 05:39:21 +0800
commit9cc755ad6a60e2b028d61c1dca62f8fe20f652d7 (patch)
tree21f099e9b4c6179754a1b3ffa2ba3db299b5f546
parent205cf0d2968cadaf769d451bbb3eac3d2dc2e265 (diff)
downloadrneovim-9cc755ad6a60e2b028d61c1dca62f8fe20f652d7.tar.gz
rneovim-9cc755ad6a60e2b028d61c1dca62f8fe20f652d7.tar.bz2
rneovim-9cc755ad6a60e2b028d61c1dca62f8fe20f652d7.zip
vim-patch:0049a495c8d4 (#27817)
runtime(doc): improve 'winfixbuf' docs (vim/vim#14180) - Make it not sound like a buffer option. - "!" is called a modifier, not an option. https://github.com/vim/vim/commit/0049a495c8d4a597773587f622d8cc8573c2eb75
-rw-r--r--runtime/doc/options.txt7
-rw-r--r--runtime/lua/vim/_meta/options.lua6
-rw-r--r--src/nvim/options.lua6
3 files changed, 10 insertions, 9 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index f35700218c..271652f8ae 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -270,6 +270,7 @@ created, thus they behave slightly differently:
Option Reason ~
'previewwindow' there can only be a single one
'scroll' specific to existing window
+ 'winfixbuf' specific to existing window
'winfixheight' specific to existing window
'winfixwidth' specific to existing window
@@ -7175,11 +7176,11 @@ A jump table for the options with a short description can be found at |Q_op|.
*'winfixbuf'* *'wfb'* *'nowinfixbuf'* *'nowfb'*
'winfixbuf' 'wfb' boolean (default off)
local to window
- If enabled, the buffer and any window that displays it are paired.
+ If enabled, the window and the buffer it is displaying are paired.
For example, attempting to change the buffer with |:edit| will fail.
Other commands which change a window's buffer such as |:cnext| will
- also skip any window with 'winfixbuf' enabled. However if a command
- has an "!" option, a window can be forced to switch buffers.
+ also skip any window with 'winfixbuf' enabled. However if an Ex
+ command has a "!" modifier, it can force switching buffers.
*'winfixheight'* *'wfh'* *'nowinfixheight'* *'nowfh'*
'winfixheight' 'wfh' boolean (default off)
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index e9ac2fe08f..cba52f0afa 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -7876,11 +7876,11 @@ vim.o.wi = vim.o.window
vim.go.window = vim.o.window
vim.go.wi = vim.go.window
---- If enabled, the buffer and any window that displays it are paired.
+--- If enabled, the window and the buffer it is displaying are paired.
--- For example, attempting to change the buffer with `:edit` will fail.
--- Other commands which change a window's buffer such as `:cnext` will
---- also skip any window with 'winfixbuf' enabled. However if a command
---- has an "!" option, a window can be forced to switch buffers.
+--- also skip any window with 'winfixbuf' enabled. However if an Ex
+--- command has a "!" modifier, it can force switching buffers.
---
--- @type boolean
vim.o.winfixbuf = false
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index 5e8bc1361c..411acbcc82 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -9822,11 +9822,11 @@ return {
abbreviation = 'wfb',
defaults = { if_true = false },
desc = [=[
- If enabled, the buffer and any window that displays it are paired.
+ If enabled, the window and the buffer it is displaying are paired.
For example, attempting to change the buffer with |:edit| will fail.
Other commands which change a window's buffer such as |:cnext| will
- also skip any window with 'winfixbuf' enabled. However if a command
- has an "!" option, a window can be forced to switch buffers.
+ also skip any window with 'winfixbuf' enabled. However if an Ex
+ command has a "!" modifier, it can force switching buffers.
]=],
full_name = 'winfixbuf',
pv_name = 'p_wfb',