Merge pull request #28315 from zeertzjq/vim-159dc0fcf950

vim-patch: runtime file updates

runtime/ftplugin/dts.vim

@@ -0,0 +1,16 @@
+" Vim filetype plugin file
+" Language:             dts/dtsi (device tree files)
+" Maintainer:           Wu, Zhenyu <wuzhenyu@ustc.edu>
+" Latest Revision:      2024 Apr 12
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = 'setl inc< cms< com<'
+
+setlocal include=^\\%(#include\\\|/include/\\)
+" same as C
+setlocal commentstring&
+setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,:///,://

runtime/ftplugin/kconfig.vim

@@ -1,9 +1,9 @@
 " Vim filetype plugin file
 " Vim syntax file
-" Maintainer:           Christian Brabandt <cb@256bit.org>
+" Maintainer:		Christian Brabandt <cb@256bit.org>
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Previous Maintainer:	Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2015-05-29
+" Latest Revision:	2024-04-12
-" License:              Vim (see :h license)
+" License:		Vim (see :h license)
 " Repository:		https://github.com/chrisbra/vim-kconfig
 
 if exists("b:did_ftplugin")
@@ -11,17 +11,12 @@ if exists("b:did_ftplugin")
 endif
 let b:did_ftplugin = 1
 
-let s:cpo_save = &cpo
+let b:undo_ftplugin = "setl inc< com< cms< fo<"
-set cpo&vim
-
-let b:undo_ftplugin = "setl com< cms< fo<"
 
+setlocal include=source\\s\\+
 setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 " For matchit.vim
 if exists("loaded_matchit")
   let b:match_words = '^\<menu\>:\<endmenu\>,^\<if\>:\<endif\>,^\<choice\>:\<endchoice\>'
 endif
-
-let &cpo = s:cpo_save
-unlet s:cpo_save