Update

9 files changed, 18 insertions, 38 deletions

diff --git a/ftplugin/eelixir.vim b/ftplugin/eelixir.vim
index 6e1d13fd..d8fb2631 100644
--- a/ftplugin/eelixir.vim
+++ b/ftplugin/eelixir.vim
@@ -24,13 +24,16 @@ if !exists("b:eelixir_subtype")
     let b:eelixir_subtype = matchstr(&filetype,'^eex\.\zs\w\+')
   endif
   if b:eelixir_subtype == ''
+    let b:eelixir_subtype = matchstr(&filetype,'^heex\.\zs\w\+')
+  endif
+  if b:eelixir_subtype == ''
     let b:eelixir_subtype = matchstr(&filetype,'^leex\.\zs\w\+')
   endif
   if b:eelixir_subtype == ''
     let b:eelixir_subtype = matchstr(&filetype,'^sface\.\zs\w\+')
   endif
   if b:eelixir_subtype == ''
-    let b:eelixir_subtype = matchstr(substitute(expand("%:t"),'\c\%(\.eex\|\.sface\|\.leex\|\.eelixir\)\+$','',''),'\.\zs\w\+$')
+    let b:eelixir_subtype = matchstr(substitute(expand("%:t"),'\c\%(\.eex\|\.heex\|\.leex\|\.sface\|\.eelixir\)\+$','',''),'\.\zs\w\+$')
   endif
   if b:eelixir_subtype == 'ex'
     let b:eelixir_subtype = 'elixir'
diff --git a/ftplugin/elixir.vim b/ftplugin/elixir.vim
index cd25464a..253d522e 100644
--- a/ftplugin/elixir.vim
+++ b/ftplugin/elixir.vim
@@ -33,7 +33,7 @@ let &l:path =
       \   &g:path
       \ ], ',')
 setlocal includeexpr=elixir#util#get_filename(v:fname)
-setlocal suffixesadd=.ex,.exs,.eex,.leex,.sface,.erl,.xrl,.yrl,.hrl
+setlocal suffixesadd=.ex,.exs,.eex,.heex,.leex,.sface,.erl,.xrl,.yrl,.hrl
 
 let &l:define = 'def\(macro\|guard\|delegate\)\=p\='
 
diff --git a/ftplugin/julia.vim b/ftplugin/julia.vim
index 39126598..dd84aa70 100644
--- a/ftplugin/julia.vim
+++ b/ftplugin/julia.vim
@@ -13,7 +13,7 @@ endif
 let b:did_ftplugin = 1
 
 let s:save_cpo = &cpo
-set cpo-=C
+set cpo&vim
 
 setlocal include=^\\s*\\%(reload\\\|include\\)\\>
 setlocal suffixesadd=.jl
@@ -89,7 +89,6 @@ if exists("loaded_matchit")
         \ . " | unlet! b:match_words b:match_skip b:match_ignorecase"
         \ . " | unlet! b:julia_begin_keywords b:julia_end_keywords"
         \ . " | delfunction JuliaGetMatchWords"
-        \ . " | call julia_blocks#remove_mappings()"
 
   if get(g:, "julia_blocks", 1)
     call julia_blocks#init_mappings()
diff --git a/ftplugin/juliadoc.vim b/ftplugin/juliadoc.vim
index 5b80149c..161545d1 100644
--- a/ftplugin/juliadoc.vim
+++ b/ftplugin/juliadoc.vim
@@ -11,7 +11,7 @@ endif
 let b:did_ftplugin = 1
 
 let s:save_cpo = &cpo
-set cpo-=C
+set cpo&vim
 
 setlocal conceallevel=2
 setlocal concealcursor=nc
diff --git a/ftplugin/ocaml.vim b/ftplugin/ocaml.vim
index 6babcef8..6ce2adcb 100644
--- a/ftplugin/ocaml.vim
+++ b/ftplugin/ocaml.vim
@@ -373,7 +373,7 @@ endfunction
               endif
             else
               let annot_file_name = ''
-              "(Pierre Vittet: I have commented 4b because this was chrashing
+              "(Pierre Vittet: I have commented 4b because this was crashing
               "my vim (it produced infinite loop))
               "
               " 4b. anarchy : the renamed _build directory may be higher in the hierarchy
@@ -464,8 +464,8 @@ endfunction
 
   "b. 'search' and 'match' work to find the type information
 
-      "In:  - lin1,col1: postion of expression first char
-      "     - lin2,col2: postion of expression last char
+      "In:  - lin1,col1: position of expression first char
+      "     - lin2,col2: position of expression last char
       "Out: - the pattern to be looked for to find the block
       " Must be called in the source buffer (use of line2byte)
     function! s:Block_pattern(lin1,lin2,col1,col2)
@@ -583,7 +583,7 @@ endfunction
       let res = substitute (a:res, "\n", "", "g" )
       "remove double space
       let res =substitute(res , "  ", " ", "g")
-      "remove space at begining of string.
+      "remove space at beginning of string.
       let res = substitute(res, "^ *", "", "g")
       return res
     endfunction
diff --git a/ftplugin/puppet.vim b/ftplugin/puppet.vim
index 5316cf5e..a57fe491 100644
--- a/ftplugin/puppet.vim
+++ b/ftplugin/puppet.vim
@@ -18,9 +18,11 @@ setlocal softtabstop=2
 setlocal shiftwidth=2
 setlocal expandtab
 setlocal keywordprg=puppet\ describe\ --providers
-setlocal iskeyword=:,@,48-57,_,192-255
 setlocal comments=sr:/*,mb:*,ex:*/,b:#
 setlocal commentstring=#\ %s
+" adding : to iskeyword is tempting in order to make word movements skip over a
+" full resource name, however since : is used in many non-keyword contexts it
+" is a bad idea to add it to the option.
 
 setlocal formatoptions-=t formatoptions+=croql
 setlocal formatexpr=puppet#format#Format()
diff --git a/ftplugin/scheme.vim b/ftplugin/scheme.vim
index a5506d3a..a2e8345c 100644
--- a/ftplugin/scheme.vim
+++ b/ftplugin/scheme.vim
@@ -4,10 +4,11 @@ endif
 
 " Vim filetype plugin file
 " Language: Scheme (R7RS)
-" Last Change: 2019 Nov 18
+" Last Change: 2019-11-19
 " Author: Evan Hanson <evhan@foldling.org>
 " Maintainer: Evan Hanson <evhan@foldling.org>
 " Previous Maintainer: Sergey Khorev <sergey.khorev@gmail.com>
+" Repository: https://git.foldling.org/vim-scheme.git
 " URL: https://foldling.org/vim/ftplugin/scheme.vim
 
 if exists('b:did_ftplugin')
@@ -52,7 +53,7 @@ let b:undo_ftplugin = b:undo_ftplugin . ' lispwords<'
 let b:did_scheme_ftplugin = 1
 
 if exists('b:is_chicken') || exists('g:is_chicken')
-  exe 'ru! ftplugin/chicken.vim'
+  runtime! ftplugin/chicken.vim
 endif
 
 unlet b:did_scheme_ftplugin
diff --git a/ftplugin/toml.vim b/ftplugin/toml.vim
deleted file mode 100644
index 8d45ea77..00000000
--- a/ftplugin/toml.vim
+++ /dev/null
@@ -1,25 +0,0 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'toml', 'ftplugin/toml.vim')
-  finish
-endif
-
-" File: ftplugin/toml.vim
-" Author: Kevin Ballard <kevin@sb.org>
-" Description: FileType Plugin for Toml
-" Last Change: Feb 12, 2019
-
-if exists('b:did_ftplugin')
-    finish
-endif
-let b:did_ftplugin = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-let b:undo_ftplugin = 'setlocal commentstring< comments<'
-
-setlocal commentstring=#\ %s
-setlocal comments=:#
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set et sw=4 ts=4:
diff --git a/ftplugin/typescript.vim b/ftplugin/typescript.vim
index fe0c7b8d..ce1de1d9 100644
--- a/ftplugin/typescript.vim
+++ b/ftplugin/typescript.vim
@@ -47,7 +47,7 @@ function! Fixedgq(lnum, count)
         return 1
     endif
 
-    " Put all the lines on one line and do normal spliting after that
+    " Put all the lines on one line and do normal splitting after that
     if l:count > 1
         while l:count > 1
             let l:count -= 1