summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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,