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 9f2214094..8654362af 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -629,6 +629,9 @@ au BufNewFile,BufRead *.elm setf elm
" Elm Filter Rules file
au BufNewFile,BufRead filter-rules setf elmfilt
+" Elsa - https://github.com/ucsd-progsys/elsa
+au BufNewFile,BufRead *.lc setf elsa
+
" ESMTP rc file
au BufNewFile,BufRead *esmtprc setf esmtprc
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 3eef5a09d..a6d87aef2 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -179,6 +179,7 @@ let s:filename_checks = {
\ 'elixir': ['file.ex', 'file.exs', 'mix.lock'],
\ 'elm': ['file.elm'],
\ 'elmfilt': ['filter-rules'],
+ \ 'elsa': ['file.lc'],
\ 'elvish': ['file.elv'],
\ 'epuppet': ['file.epp'],
\ 'erlang': ['file.erl', 'file.hrl', 'file.yaws'],
diff --git a/src/version.c b/src/version.c
index 2324ff213..3dcac436c 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 */
/**/
+ 1261,
+/**/
1260,
/**/
1259,