runtime(filetype): improve *.h filetype detection
This commit changes *.h files to default to C (instead of C++), and
deprecates the existing `g:c_syntax_for_h` and `g:ch_syntax_for_h`
variables in favor of a unified `g:filetype_h`, like is used for other
ambiguous file extensions.
closes: #17135
Signed-off-by: Amelia Clarke <selene@perilune.dev>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index c0bf1e6..77bf5f3 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/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 19
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -153,7 +153,11 @@
*.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
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index ae89bd9..a8fbe1a 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt* For Vim version 9.1. Last change: 2025 Apr 15
+*syntax.txt* For Vim version 9.1. Last change: 2025 Apr 19
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1056,8 +1056,12 @@
*c_ansi_typedefs* ... but do standard ANSI types
*c_ansi_constants* ... but do standard ANSI constants
*c_no_utf* don't highlight \u and \U in strings
-*c_syntax_for_h* for *.h files use C syntax instead of C++ and use objc
- syntax instead of objcpp
+*c_syntax_for_h* use C syntax for *.h files instead of C++/ObjC/ObjC++
+ (NOTE: This variable is deprecated and no longer
+ necessary, as *.h files now default to C, unless the
+ file contains C++ or Objective-C syntax. If the
+ automated detection fails, the default filetype can
+ be adjusted using `g:filetype_h`.)
*c_no_if0* don't highlight "#if 0" blocks as comments
*c_no_cformat* don't highlight %-formats in strings
*c_no_c99* don't highlight C99 standard items
@@ -1116,8 +1120,11 @@
By setting a variable you can tell Vim to use Ch syntax for *.h files, instead
of C or C++: >
- :let ch_syntax_for_h = 1
+ :let g:filetype_h = 'ch'
+NOTE: In previous versions of Vim, the following (now-deprecated) variable was
+used, but is no longer the preferred approach: >
+ :let ch_syntax_for_h = 1
CHILL *chill.vim* *ft-chill-syntax*