Merge pull request #1639 from vim-jp/hh-update-options

Update options.{txt,jax}

Author: h-east

doc/options.jax

@@ -1,4 +1,4 @@
-*options.txt*	For Vim バージョン 9.1.  Last change: 2024 Jul 09
+*options.txt*	For Vim バージョン 9.1.  Last change: 2024 Jul 28
 
 
 		  VIMリファレンスマニュアル    by Bram Moolenaar
@@ -97,7 +97,7 @@ Vimには、特別な働きをさせるための多くの内部変数とスイ
 :se[t] {option}:{value}
 			数値および文字列オプションの値を {value} に設定する。
 			数値オプションの値は、10進数、(0x を頭に付けて) 16進数、
-			または ('0' を頭に付けて) 8進数で指定できる。
+			または ('0' か '0o' を頭に付けて) 8進数で指定できる。
 			オプション 'wildchar' で指定された文字 (既定では
 			<Tab>、オプション 'compatible' がオンならば CTRL-E)
 			を打ち込むと、古い値を挿入できる。固定された構文と名前
@@ -2297,7 +2297,9 @@ Note 1番目の形式では、行全体がオプション指定に使われる
 	'preserveindent' も参照。
 
 						*'cpoptions'* *'cpo'* *cpo*
-'cpoptions' 'cpo'	文字列	(Vimの既定値: "aABceFs", Viの既定値:  全フラグ)
+'cpoptions' 'cpo'	文字列	(Vimの既定値: "aABceFsz",
+				 Viの既定値:  "#{|&/\." を除く全てのフラグ
+				 |$VIM_POSIX|:  全てのフラグ)
 			グローバル
 	1文字のフラグの列で設定する。フラグが設定されると、対応する動作がVi互
 	換になる。大部分、またはある程度のVi互換が求められるときに使われる。
@@ -2521,6 +2523,9 @@ Note 1番目の形式では、行全体がオプション指定に使われる
 								*cpo-Z*
 		Z	オプション 'readonly' がオンになっているのに "w!" をし
 			たとき 'readonly' をオフにしない。
+								*cpo-z*
+		z	"cw" および "d" コマンドの特殊ケース (|cw| および
+			|d-special| を参照)。
 								*cpo-!*
 		!	フィルタコマンドをリドゥするとき、何であってもとにかく
 			最後に実行された外部コマンドを使う。これが含まれないと、
@@ -6216,7 +6221,7 @@ Note 1番目の形式では、行全体がオプション指定に使われる
 		:set path+=
 <	環境変数を使うには、その中の区切り文字を変える必要があるだろう。次のも
 	のは環境変数 $INCL を追加する例だが、その中ではディレクトリ名はセミコ
-	ロン ';' で区切られているとする。 >
+	ロンで区切られているとする。 >
 		:let &path = &path .. "," .. substitute($INCL, ';', ',', 'g')
 <	文字 ';' を ':' または指定可能な区切り文字で置換する。  Note この方法
 	は、$INCL がコンマや空白を含んでいるときには使えないので注意。
@@ -6768,7 +6773,7 @@ Note 1番目の形式では、行全体がオプション指定に使われる
 	  import/	`:import` によって探されるファイル
 	  indent/	インデントスクリプト |indent-expression|
 	  keymap/	キーマップ定義ファイル |mbyte-keymap|
-	  lang/		翻訳版メニュー |:menutrans|
+	  lang/		翻訳版メッセージ |:menutrans| および |multi-lang|
 	  menu.vim	GUI版メニュー |menu.vim|
 	  pack/		パッケージ |:packadd|
 	  plugin/	プラグインスクリプト |write-plugin|
@@ -8139,6 +8144,19 @@ Note 1番目の形式では、行全体がオプション指定に使われる
 	バッファにはコピーされない。
 	通常のファイル名文字だけが使える。"/\*?[|<>" は不正である。
 
+						*'tabclose'* *'tcl'*
+'tabclose' 'tcl'	文字列	(既定では "")
+			グローバル
+	このオプションは、タブページを閉じるときの動作を制御する (例:
+	|:tabclose| を使用)。空の場合、Vim は次 (右) のタブページに移動する。
+
+	可能な値 (コンマ区切りのリスト):
+	   left		含まれている場合、次のタブページではなく前のタブページ
+			に移動する。
+	   uselast	含まれている場合、可能であれば以前に使用したタブページ
+			に移動する。このオプションは他のオプションよりも優先さ
+			れる。
+
 						*'tabline'* *'tal'*
 'tabline' 'tal'		文字列	(既定では "")
 			グローバル

en/options.txt

@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 9.1.  Last change: 2024 Jul 09
+*options.txt*	For Vim version 9.1.  Last change: 2024 Jul 28
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -76,7 +76,8 @@ achieve special effects.  These options come in three forms:
 :se[t] {option}:{value}
 			Set string or number option to {value}.
 			For numeric options the value can be given in decimal,
-			hex (preceded with 0x) or octal (preceded with '0').
+			hex (preceded with 0x) or octal (preceded with '0' or
+			'0o').
 			The old value can be inserted by typing 'wildchar' (by
 			default this is a <Tab> or CTRL-E if 'compatible' is
 			set). Many string options with fixed syntax and names
@@ -1476,7 +1477,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			    applying 'breakindent', even if the resulting
 			    text should normally be narrower. This prevents
 			    text indented almost to the right window border
-			    occupying lot of vertical space when broken.
+			    occupying lots of vertical space when broken.
 			    (default: 20)
 		shift:{n}   After applying 'breakindent', the wrapped line's
 			    beginning will be shifted by the given number of
@@ -2257,8 +2258,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Also see 'preserveindent'.
 
 						*'cpoptions'* *'cpo'* *cpo*
-'cpoptions' 'cpo'	string	(Vim default: "aABceFs",
-				 Vi default:  all flags)
+'cpoptions' 'cpo'	string	(Vim default: "aABceFsz",
+				 Vi default:  all flags, except "#{|&/\."
+                                 |$VIM_POSIX|:  all flags)
 			global
 	A sequence of single character flags.  When a character is present
 	this indicates Vi-compatible behavior.  This is used for things where
@@ -2486,6 +2488,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 								*cpo-Z*
 		Z	When using "w!" while the 'readonly' option is set,
 			don't reset 'readonly'.
+								*cpo-z*
+		z	Special casing the "cw" and "d" command (see |cw| and
+			|d-special|).
 								*cpo-!*
 		!	When redoing a filter command, use the last used
 			external command, whatever it was.  Otherwise the last
@@ -4727,7 +4732,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	in Insert mode as specified with the 'indentkeys' option.
 	When this option is not empty, it overrules the 'cindent' and
 	'smartindent' indenting.  When 'lisp' is set, this option is
-	is only used when 'lispoptions' contains "expr:1".
+	only used when 'lispoptions' contains "expr:1".
 	When 'paste' is set this option is not used for indenting.
 	The expression is evaluated with |v:lnum| set to the line number for
 	which the indent is to be computed.  The cursor is also in this line
@@ -5090,7 +5095,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	part can be in one of two forms:
 	1.  A list of pairs.  Each pair is a "from" character immediately
 	    followed by the "to" character.  Examples: "aA", "aAbBcC".
-	2.  A list of "from" characters, a semi-colon and a list of "to"
+	2.  A list of "from" characters, a semicolon and a list of "to"
 	    characters.  Example: "abc;ABC"
 	Example: "aA,fgh;FGH,cCdDeE"
 	Special characters need to be preceded with a backslash.  These are
@@ -5172,7 +5177,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	update use |:redraw|.
 	This may occasionally cause display errors.  It is only meant to be set
 	temporarily when performing an operation where redrawing may cause
-	flickering or cause a slow down.
+	flickering or cause a slowdown.
 
 			*'linebreak'* *'lbr'* *'nolinebreak'* *'nolbr'*
 'linebreak' 'lbr'	boolean	(default off)
@@ -5914,17 +5919,17 @@ A jump table for the options with a short description can be found at |Q_op|.
 		    Using CTRL-X on "0" or CTRL-A on "18446744073709551615"
 		    (2^64 - 1) has no effect, overflow is prevented.
 	blank	If included, treat numbers as signed or unsigned based on
-		preceding whitespace. If a number with a leading dash has its
+		preceding whitespace.  If a number with a leading dash has its
 		dash immediately preceded by a non-whitespace character (i.e.,
 		not a tab or a " "), the negative sign won't be considered as
 		part of the number.  For example:
 		    Using CTRL-A on "14" in "Carbon-14" results in "Carbon-15"
 		    (without "blank" it would become "Carbon-13").
 		    Using CTRL-X on "8" in "Carbon -8" results in "Carbon -9"
-		    (because -8 is preceded by whitespace. If "unsigned" was
+		    (because -8 is preceded by whitespace.  If "unsigned" was
 		    set, it would result in "Carbon -7").
 		If this format is included, overflow is prevented as if
-		"unsigned" were set. If both this format and "unsigned" are
+		"unsigned" were set.  If both this format and "unsigned" are
 		included, "unsigned" will take precedence.
 
 	Numbers which simply begin with a digit in the range 1-9 are always
@@ -6174,7 +6179,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		:set path+=
 <	To use an environment variable, you probably need to replace the
 	separator.  Here is an example to append $INCL, in which directory
-	names are separated with a semi-colon: >
+	names are separated with a semicolon: >
 		:let &path = &path .. "," .. substitute($INCL, ';', ',', 'g')
 <	Replace the ';' with a ':' or whatever separator is used.  Note that
 	this doesn't work when $INCL contains a comma or white space.
@@ -6753,7 +6758,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	  import/	files that are found by `:import`
 	  indent/	indent scripts |indent-expression|
 	  keymap/	key mapping files |mbyte-keymap|
-	  lang/		menu translations |:menutrans|
+	  lang/		message translations |:menutrans| and |multi-lang|
 	  menu.vim	GUI menus |menu.vim|
 	  pack/		packages |:packadd|
 	  plugin/	plugin scripts |write-plugin|
@@ -7241,7 +7246,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 							POSIX default: "AS")
 			global					*E1336*
 	This option helps to avoid all the |hit-enter| prompts caused by file
-	messages, for example  with CTRL-G, and to avoid some other messages.
+	messages, for example with CTRL-G, and to avoid some other messages.
 	It is a list of flags:
 	 flag	meaning when present	~
 	  f	use "(3 of 5)" instead of "(file 3 of 5)"		*shm-f*
@@ -7698,7 +7703,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			minus two.
 
 	timeout:{millisec}   Limit the time searching for suggestions to
-			{millisec} milli seconds.  Applies to the following
+			{millisec} milliseconds.  Applies to the following
 			methods.  When omitted the limit is 5000. When
 			negative there is no limit.  {only works when built
 			with the |+reltime| feature}
@@ -8100,6 +8105,19 @@ A jump table for the options with a short description can be found at |Q_op|.
 	'S' flag in 'cpoptions'.
 	Only normal file name characters can be used, "/\*?[|<>" are illegal.
 
+						*'tabclose'* *'tcl'*
+'tabclose' 'tcl'	string	(default "")
+			global
+	This option controls the behavior when closing tab pages (e.g., using
+	|:tabclose|).  When empty Vim goes to the next (right) tab page.
+
+	Possible values (comma-separated list):
+	   left		If included, go to the previous tab page instead of
+			the next one.
+	   uselast	If included, go to the previously used tab page if
+			possible.  This option takes precedence over the
+			others.
+
 						*'tabline'* *'tal'*
 'tabline' 'tal'		string	(default empty)
 			global