diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-09-26 11:56:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-26 11:56:45 -0400 |
| commit | 430ad9ab20b97b4c9a60732117e618bbe5236765 (patch) | |
| tree | 0925ffd408f3dc052dba61117791f5aeaca878d7 /runtime | |
| parent | 4a996bc431163b2a7b8e4bf3351d862887a78f83 (diff) | |
| parent | e22c15682a76b6c531fea5b6d8896ecbaf582253 (diff) | |
| download | rneovim-430ad9ab20b97b4c9a60732117e618bbe5236765.tar.gz rneovim-430ad9ab20b97b4c9a60732117e618bbe5236765.tar.bz2 rneovim-430ad9ab20b97b4c9a60732117e618bbe5236765.zip | |
Merge pull request #12986 from janlazo/vim-8.2.1738
vim-patch:8.1.{524,1613},8.2.{1088,1713,1715,1717,1721,1725,1735,1738,1745}
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/vim_diff.txt | 1 | ||||
| -rw-r--r-- | runtime/filetype.vim | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt index 4bcea3e3fe..3090be82f2 100644 --- a/runtime/doc/vim_diff.txt +++ b/runtime/doc/vim_diff.txt @@ -508,7 +508,6 @@ Test functions: test_alloc_fail() test_autochdir() test_disable_char_avail() - test_garbagecollect_now() test_null_channel() test_null_dict() test_null_job() diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 32bd6daba0..c464e8cebd 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1158,10 +1158,10 @@ au BufNewFile,BufRead *.papp,*.pxml,*.pxsl setf papp au BufNewFile,BufRead */etc/passwd,*/etc/passwd-,*/etc/passwd.edit,*/etc/shadow,*/etc/shadow-,*/etc/shadow.edit,*/var/backups/passwd.bak,*/var/backups/shadow.bak setf passwd " Pascal (also *.p) -au BufNewFile,BufRead *.pas setf pascal +au BufNewFile,BufRead *.pas,*.pp setf pascal -" Delphi project file -au BufNewFile,BufRead *.dpr setf pascal +" Delphi or Lazarus program file +au BufNewFile,BufRead *.dpr,*.lpr setf pascal " PDF au BufNewFile,BufRead *.pdf setf pdf @@ -1732,7 +1732,7 @@ au BufNewFile,BufRead *.texinfo,*.texi,*.txi setf texinfo au BufNewFile,BufRead texmf.cnf setf texmf " Tidy config -au BufNewFile,BufRead .tidyrc,tidyrc setf tidy +au BufNewFile,BufRead .tidyrc,tidyrc,tidy.conf setf tidy " TF mud client au BufNewFile,BufRead *.tf,.tfrc,tfrc setf tf |