From 20e46cb38d4282be625bd44813670e9edfd3284e Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Fri, 3 Apr 2026 22:29:45 +0800 Subject: [PATCH] vim-patch:af58a9f: runtime(doc): adjust :h 'autowrite' and :h 'autowriteall' - Don't go over 78 columns. - Change the first "and" to "or", as "or" is used below. - Change "takes one" to "switches", as "one" may be mistaken as referring to the command instead of the user. - Use backticks in :h 'autowriteall' like in :h 'autowrite'. closes: vim/vim#19859 https://github.com/vim/vim/commit/af58a9f5e9e0bf748700645d07c6262eb281d737 --- runtime/doc/options.txt | 12 ++++++------ runtime/lua/vim/_meta/options.lua | 12 ++++++------ src/nvim/options.lua | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 1fc0e9d32c..53d1891f6a 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -822,10 +822,10 @@ A jump table for the options with a short description can be found at |Q_op|. 'autowrite' 'aw' boolean (default off) global Write the contents of the file, if it has been modified, on each - `:next`, `:rewind`, `:last`, `:first`, `:previous`, `:stop`, - `:suspend`, `:tag`, `:!`, `:make`, `:terminal`, CTRL-] and CTRL-^ command; and when - a `:buffer`, CTRL-O, CTRL-I, '{A-Z0-9}, or `{A-Z0-9} command takes one - to another file. + `:next`, `:rewind`, `:last`, `:first`, `:previous`, `:tag`, `:stop`, + `:suspend`, `:!`, `:make`, `:terminal`, CTRL-] or CTRL-^ command; and + when a `:buffer`, CTRL-O, CTRL-I, '{A-Z0-9}, or `{A-Z0-9} command + switches to another file. A buffer is not written if it becomes hidden, e.g. when 'bufhidden' is set to "hide" and `:next` is used. Note that for some commands the 'autowrite' option is not used, see @@ -839,8 +839,8 @@ A jump table for the options with a short description can be found at |Q_op|. *'autowriteall'* *'awa'* *'noautowriteall'* *'noawa'* 'autowriteall' 'awa' boolean (default off) global - Like 'autowrite', but also used for commands ":edit", ":enew", - ":quit", ":qall", ":exit", ":xit", ":recover" and closing the Vim + Like 'autowrite', but also used for commands `:edit`, `:enew`, + `:quit`, `:qall`, `:exit`, `:xit`, `:recover` and closing the Vim window. Setting this option also implies that Vim behaves like 'autowrite' has been set. diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua index 35dea8b68b..383c1dac5b 100644 --- a/runtime/lua/vim/_meta/options.lua +++ b/runtime/lua/vim/_meta/options.lua @@ -189,10 +189,10 @@ vim.go.autoread = vim.o.autoread vim.go.ar = vim.go.autoread --- Write the contents of the file, if it has been modified, on each ---- `:next`, `:rewind`, `:last`, `:first`, `:previous`, `:stop`, ---- `:suspend`, `:tag`, `:!`, `:make`, `:terminal`, CTRL-] and CTRL-^ command; and when ---- a `:buffer`, CTRL-O, CTRL-I, '{A-Z0-9}, or `{A-Z0-9} command takes one ---- to another file. +--- `:next`, `:rewind`, `:last`, `:first`, `:previous`, `:tag`, `:stop`, +--- `:suspend`, `:!`, `:make`, `:terminal`, CTRL-] or CTRL-^ command; and +--- when a `:buffer`, CTRL-O, CTRL-I, '{A-Z0-9}, or `{A-Z0-9} command +--- switches to another file. --- A buffer is not written if it becomes hidden, e.g. when 'bufhidden' is --- set to "hide" and `:next` is used. --- Note that for some commands the 'autowrite' option is not used, see @@ -209,8 +209,8 @@ vim.o.aw = vim.o.autowrite vim.go.autowrite = vim.o.autowrite vim.go.aw = vim.go.autowrite ---- Like 'autowrite', but also used for commands ":edit", ":enew", ---- ":quit", ":qall", ":exit", ":xit", ":recover" and closing the Vim +--- Like 'autowrite', but also used for commands `:edit`, `:enew`, +--- `:quit`, `:qall`, `:exit`, `:xit`, `:recover` and closing the Vim --- window. --- Setting this option also implies that Vim behaves like 'autowrite' has --- been set. diff --git a/src/nvim/options.lua b/src/nvim/options.lua index 08f636e0ed..118aa756ad 100644 --- a/src/nvim/options.lua +++ b/src/nvim/options.lua @@ -323,10 +323,10 @@ local options = { defaults = false, desc = [=[ Write the contents of the file, if it has been modified, on each - `:next`, `:rewind`, `:last`, `:first`, `:previous`, `:stop`, - `:suspend`, `:tag`, `:!`, `:make`, `:terminal`, CTRL-] and CTRL-^ command; and when - a `:buffer`, CTRL-O, CTRL-I, '{A-Z0-9}, or `{A-Z0-9} command takes one - to another file. + `:next`, `:rewind`, `:last`, `:first`, `:previous`, `:tag`, `:stop`, + `:suspend`, `:!`, `:make`, `:terminal`, CTRL-] or CTRL-^ command; and + when a `:buffer`, CTRL-O, CTRL-I, '{A-Z0-9}, or `{A-Z0-9} command + switches to another file. A buffer is not written if it becomes hidden, e.g. when 'bufhidden' is set to "hide" and `:next` is used. Note that for some commands the 'autowrite' option is not used, see @@ -347,8 +347,8 @@ local options = { abbreviation = 'awa', defaults = false, desc = [=[ - Like 'autowrite', but also used for commands ":edit", ":enew", - ":quit", ":qall", ":exit", ":xit", ":recover" and closing the Vim + Like 'autowrite', but also used for commands `:edit`, `:enew`, + `:quit`, `:qall`, `:exit`, `:xit`, `:recover` and closing the Vim window. Setting this option also implies that Vim behaves like 'autowrite' has been set.