summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWu, Zhenyu <wuzhenyu@ustc.edu>2024-03-31 19:57:16 +0200
committerChristian Brabandt <cb@256bit.org>2024-03-31 19:57:16 +0200
commit4c7098b00a5edfb25b24fe3210866a4f30a2d78f (patch)
tree5952450c9e29e733150c286863e5ee96e58d2893
parenta917bd58bde0e1fca2affedc6fc0c15cb6b5e9f2 (diff)
patch 9.1.0250: filetype: ldscripts cannot be recognizedv9.1.0250
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>
-rw-r--r--runtime/filetype.vim2
-rw-r--r--src/testdir/test_filetype.vim2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 9e842cc960..1545ea5ef1 100644
--- 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 19846d97cf..14476cbcae 100644
--- 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 5278867360..42a9a1adad 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 250,
+/**/
249,
/**/
248,