summaryrefslogtreecommitdiff
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 7810077cd..6fa16a7e0 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -671,6 +671,9 @@ autocmd BufRead,BufNewFile *.fnl setf fennel
" Fetchmail RC file
au BufNewFile,BufRead .fetchmailrc setf fetchmail
+" FIRRTL - Flexible Internal Representation for RTL
+au BufNewFile,BufRead *.fir setf firrtl
+
" Fish shell
au BufNewFile,BufRead *.fish setf fish
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 03fd2354c..101bdfd97 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -197,6 +197,7 @@ let s:filename_checks = {
\ 'fennel': ['file.fnl'],
\ 'fetchmail': ['.fetchmailrc'],
\ 'fgl': ['file.4gl', 'file.4gh', 'file.m4gl'],
+ \ 'firrtl': ['file.fir'],
\ 'fish': ['file.fish'],
\ 'focexec': ['file.fex', 'file.focexec'],
\ 'form': ['file.frm'],
diff --git a/src/version.c b/src/version.c
index ff2105c87..8facdc4e7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1274,
+/**/
1273,
/**/
1272,