summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-07-25 16:53:12 +0200
committerBram Moolenaar <Bram@vim.org>2020-07-25 16:53:12 +0200
commit2afc3b4f776a4fe2bb22d0a79e77012d79b4ec1e (patch)
tree7f106389dc9cad1662cdd79c1f4f4f1c50135eea
parent24aa48b7a265c24e18f0f978dfe0255e138e2b90 (diff)
patch 8.2.1292: AIDL filetype not recognizedv8.2.1292
Problem: AIDL filetype not recognized. Solution: Add filetype detection. (Dominique Pellé, closes #6533)
-rw-r--r--runtime/filetype.vim3
-rw-r--r--src/testdir/test_filetype.vim1
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 0 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 7c76b12ee3..80ea2949cc 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -88,6 +88,9 @@ endif
" AHDL
au BufNewFile,BufRead *.tdf setf ahdl
+" AIDL
+au BufNewFile,BufRead *.aidl setf aidl
+
" AMPL
au BufNewFile,BufRead *.run setf ampl
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 8ec8355c24..2e517c0bb9 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -54,6 +54,7 @@ let s:filename_checks = {
\ 'acedb': ['file.wrm'],
\ 'ada': ['file.adb', 'file.ads', 'file.ada', 'file.gpr'],
\ 'ahdl': ['file.tdf'],
+ \ 'aidl': ['file.aidl'],
\ 'alsaconf': ['.asoundrc', '/usr/share/alsa/alsa.conf', '/etc/asound.conf'],
\ 'aml': ['file.aml'],
\ 'ampl': ['file.run'],
diff --git a/src/version.c b/src/version.c
index 8934011f65..3611fe6a4b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1292,
+/**/
1291,
/**/
1290,
add'>+ " This needs dash, plain bashs sh does not seem to work :(
let buf = RunVimInTerminal('', #{rows: 20, cmd: 'sh'})
call term_sendkeys(buf, s:xxd_cmd .. " -R never < XXDfile_colors\<cr>")
call TermWait(buf)
diff --git a/src/version.c b/src/version.c
index f2ffa40dba..de89cd5009 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1878,
+/**/
1877,
/**/
1876,