aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2024-03-31 19:58:49 +0200
committerChristian Clason <c.clason@uni-graz.at>2024-04-01 12:01:47 +0200
commit2e97ae26647cb52e028d59a6e4e57d28c93e6283 (patch)
tree346f02959f5715c88bba17c18ede3590f9c7ce56
parent000431820e1e0886be99e68c2667633f1e4b18c6 (diff)
downloadrneovim-2e97ae26647cb52e028d59a6e4e57d28c93e6283.tar.gz
rneovim-2e97ae26647cb52e028d59a6e4e57d28c93e6283.tar.bz2
rneovim-2e97ae26647cb52e028d59a6e4e57d28c93e6283.zip
vim-patch:9.1.0250: filetype: ldscripts cannot be recognized
Problem: filetype: ldscripts cannot be recognized Solution: Detect '*/ldscripts/*' as ld (Wu, Zhenyu) closes: vim/vim#14371 https://github.com/vim/vim/commit/4c7098b00a5edfb25b24fe3210866a4f30a2d78f Co-authored-by: Wu, Zhenyu <wuzhenyu@ustc.edu>
-rw-r--r--runtime/lua/vim/filetype.lua1
-rw-r--r--test/old/testdir/test_filetype.vim2
2 files changed, 2 insertions, 1 deletions
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 3fc208c7a4..86374b26e5 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1775,6 +1775,7 @@ local pattern = {
['.*%.[Ss][Uu][Bb]'] = 'krl',
['lilo%.conf.*'] = starsetf('lilo'),
['.*/etc/logcheck/.*%.d.*/.*'] = starsetf('logcheck'),
+ ['.*/ldscripts/.*'] = 'ld',
['.*lftp/rc'] = 'lftp',
['.*/%.libao'] = 'libao',
['.*/etc/libao%.conf'] = 'libao',
diff --git a/test/old/testdir/test_filetype.vim b/test/old/testdir/test_filetype.vim
index dedda9e6ce..4f2980d1bb 100644
--- a/test/old/testdir/test_filetype.vim
+++ b/test/old/testdir/test_filetype.vim
@@ -358,7 +358,7 @@ func s:GetFilenameChecks() abort
\ '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'],