Merge pull request #2052 from h-east/update-filetype

Update filetype.{txt,jax}

Author: h-east

doc/filetype.jax

@@ -1,4 +1,4 @@
-*filetype.txt*	For Vim バージョン 9.1.  Last change: 2025 Apr 16
+*filetype.txt*	For Vim バージョン 9.1.  Last change: 2025 Apr 27
 
 
 		VIMリファレンスマニュアル    by Bram Moolenaar
@@ -159,7 +159,11 @@ NOTE: Vi互換とは全てのオプションがグローバルであることを
 	*.f		g:filetype_f		|ft-forth-syntax|
 	*.frm		g:filetype_frm		|ft-form-syntax|
 	*.fs		g:filetype_fs		|ft-forth-syntax|
-	*.h		g:c_syntax_for_h	|ft-c-syntax|
+	*.h		g:c_syntax_for_h	|ft-c-syntax|	(非推奨)
+	*.h		g:ch_syntax_for_h	|ft-ch-syntax|	(非推奨)
+	*.h		g:filetype_h		|ft-c-syntax|
+						|ft-ch-syntax|
+						|ft-cpp-syntax|
 	*.i		g:filetype_i		|ft-progress-syntax|
 	*.inc		g:filetype_inc
 	*.lsl		g:filetype_lsl
@@ -1034,6 +1038,13 @@ Vim ファイルタイププラグインは、[[ および ]] で関数の先頭
 	let g:no_vim_maps = 1
 
 
+YAML							*ft-yaml-plugin*
+デフォルトでは、YAML ファイルタイププラグインは以下のオプションを有効にする: >
+	setlocal shiftwidth=2 softtabstop=2
+
+これを無効にするには、以下の変数を設定する: >
+	let g:yaml_recommended_style = 0
+
 ZIG							*ft-zig-plugin*
 
 						*g:zig_recommended_style*

en/filetype.txt

@@ -1,4 +1,4 @@
-*filetype.txt*	For Vim version 9.1.  Last change: 2025 Apr 16
+*filetype.txt*	For Vim version 9.1.  Last change: 2025 Apr 27
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -153,7 +153,11 @@ variables can be used to overrule the filetype used for certain extensions:
 	*.f		g:filetype_f		|ft-forth-syntax|
 	*.frm		g:filetype_frm		|ft-form-syntax|
 	*.fs		g:filetype_fs		|ft-forth-syntax|
-	*.h		g:c_syntax_for_h	|ft-c-syntax|
+	*.h		g:c_syntax_for_h	|ft-c-syntax|	(deprecated)
+	*.h		g:ch_syntax_for_h	|ft-ch-syntax|	(deprecated)
+	*.h		g:filetype_h		|ft-c-syntax|
+						|ft-ch-syntax|
+						|ft-cpp-syntax|
 	*.i		g:filetype_i		|ft-progress-syntax|
 	*.inc		g:filetype_inc
 	*.lsl		g:filetype_lsl
@@ -265,7 +269,7 @@ D. If your filetype can only be detected by inspecting the contents of the
       item of the 'runtimepath' option.  Example for Unix: >
 	:!mkdir ~/.vim
 <
-   2. Create a vim script file for doing this.  Example: >
+   2. Create a Vim script file for doing this.  Example: >
 	if did_filetype()	" filetype already set..
 	  finish		" ..don't do these checks
 	endif
@@ -1039,6 +1043,13 @@ functions with [[ and ]].  Move around comments with ]" and [".
 The mappings can be disabled with: >
 	let g:no_vim_maps = 1
 
+YAML							*ft-yaml-plugin*
+By default, the YAML filetype plugin enables the following options: >
+	setlocal shiftwidth=2 softtabstop=2
+
+To disable this, set the following variable: >
+	let g:yaml_recommended_style = 0
+
 
 ZIG							*ft-zig-plugin*