diff options
| author | Matthieu Coudron <mattator@gmail.com> | 2020-06-06 02:05:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-06 02:05:49 +0200 |
| commit | 33dafc4f0f21f763dac8f6bdbd27117666f908c5 (patch) | |
| tree | 179301040b52babddbe60001bc5c9b467edc310a /runtime | |
| parent | fca471d8e2573c2351151051a2d2c6eee0b2243b (diff) | |
| parent | 9538a7895cb6af2312a39c4c0710ace638309914 (diff) | |
| download | rneovim-33dafc4f0f21f763dac8f6bdbd27117666f908c5.tar.gz rneovim-33dafc4f0f21f763dac8f6bdbd27117666f908c5.tar.bz2 rneovim-33dafc4f0f21f763dac8f6bdbd27117666f908c5.zip | |
Merge pull request #12413 from janlazo/vim-8.2.0089
[RDY]vim-patch:8.0.1564,8.1.{917,1895,2018,2335},8.2.{89,491,873,892,905}
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/eval.txt | 1 | ||||
| -rw-r--r-- | runtime/filetype.vim | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 7f50769023..99bc526659 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -5835,6 +5835,7 @@ maparg({name} [, {mode} [, {abbr} [, {dict}]]]) *maparg()* "rhs" The {rhs} of the mapping as typed. "silent" 1 for a |:map-silent| mapping, else 0. "noremap" 1 if the {rhs} of the mapping is not remappable. + "script" 1 if mapping was defined with <script>. "expr" 1 for an expression mapping (|:map-<expr>|). "buffer" 1 for a buffer local mapping (|:map-local|). "mode" Modes for which the mapping is defined. In diff --git a/runtime/filetype.vim b/runtime/filetype.vim index b29168984c..383a45b9d3 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -883,11 +883,12 @@ au BufNewFile,BufRead *.ll setf lifelines " Lilo: Linux loader au BufNewFile,BufRead lilo.conf setf lilo -" Lisp (*.el = ELisp, *.cl = Common Lisp, *.jl = librep Lisp) +" Lisp (*.el = ELisp, *.cl = Common Lisp) +" *.jl was removed, it's also used for Julia, better skip than guess wrong. if has("fname_case") - au BufNewFile,BufRead *.lsp,*.lisp,*.el,*.cl,*.jl,*.L,.emacs,.sawfishrc setf lisp + au BufNewFile,BufRead *.lsp,*.lisp,*.el,*.cl,*.L,.emacs,.sawfishrc setf lisp else - au BufNewFile,BufRead *.lsp,*.lisp,*.el,*.cl,*.jl,.emacs,.sawfishrc setf lisp + au BufNewFile,BufRead *.lsp,*.lisp,*.el,*.cl,.emacs,.sawfishrc setf lisp endif " SBCL implementation of Common Lisp |