patch 9.1.0250: filetype: ldscripts cannot be recognized

Problem:  filetype: ldscripts cannot be recognized
Solution: Detect '*/ldscripts/*' as ld
          (Wu, Zhenyu)

closes: #14371

Signed-off-by: Wu, Zhenyu <wuzhenyu@ustc.edu>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 9e842cc960b633f6fa7412a9838b8c66e85a5c81..1545ea5ef133b816bc2bd0e276f425caaebd996b 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1183,7 +1183,7 @@ au BufNewFile,BufRead *.sig                       call dist#ft#FTsig()
 au BufNewFile,BufRead *.ldif                   setf ldif
 
 " Ld loader
-au BufNewFile,BufRead *.ld                     setf ld
+au BufNewFile,BufRead *.ld,*/ldscripts/*       setf ld
 
 " Lean
 au BufNewFile,BufRead *.lean                   setf lean

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 19846d97cf314df37c5f2fc0ae2fc198dcd9df9b..14476cbcae35e4e9253497a6eb78441d9c43a20b 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -368,7 +368,7 @@ def s:GetFilenameChecks(): dict<list<string>>
     kwt: ['file.k'],
     lace: ['file.ace', 'file.ACE'],
     latte: ['file.latte', 'file.lte'],
-    ld: ['file.ld'],
+    ld: ['file.ld', 'any/usr/lib/aarch64-xilinx-linux/ldscripts/aarch64elf32b.x'],
     ldif: ['file.ldif'],
     lean: ['file.lean'],
     ledger: ['file.ldg', 'file.ledger', 'file.journal'],

diff --git a/src/version.c b/src/version.c
index 5278867360ed2f2470a7a568434afb70c26f5722..42a9a1adad8a7e8f5ea553270101d4cba55dc0a9 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    250,
 /**/
     249,
 /**/