diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2020-05-05 23:38:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-05 23:38:15 -0400 |
| commit | f04a9a2c9aa68f98a79b8d7e9917719a8be6049b (patch) | |
| tree | 4cd229a5856e1dfb1ad42bcf7e9ea3e0fb07f3dd /runtime | |
| parent | d2766b06c8fc50d06765c5c607744cc6b5f5ef0a (diff) | |
| parent | ed4df85f6bae488d763b5d0eebbf2db9da25551d (diff) | |
| download | rneovim-f04a9a2c9aa68f98a79b8d7e9917719a8be6049b.tar.gz rneovim-f04a9a2c9aa68f98a79b8d7e9917719a8be6049b.tar.bz2 rneovim-f04a9a2c9aa68f98a79b8d7e9917719a8be6049b.zip | |
Merge #12203 from janlazo/vim-8.2.0648
vim-patch:8.1.{800,868,1581},8.2.{648,649,663,678,681,688,691,692}
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/options.txt | 2 | ||||
| -rw-r--r-- | runtime/filetype.vim | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 009695c13c..8d4f76d3dd 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -6516,9 +6516,11 @@ A jump table for the options with a short description can be found at |Q_op|. >= 1 When the shada file is read or written. >= 2 When a file is ":source"'ed. >= 3 UI info, terminal capabilities + >= 4 Shell commands. >= 5 Every searched tags file and include file. >= 8 Files for which a group of autocommands is executed. >= 9 Every executed autocommand. + >= 11 Finding items in a path >= 12 Every executed function. >= 13 When an exception is thrown, caught, finished, or discarded. >= 14 Anything pending in a ":finally" clause. diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 5068f9be76..dc0bca2c60 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2020 Apr 12 +" Last Change: 2020 Apr 29 " Listen very carefully, I will say this only once if exists("did_load_filetypes") @@ -1646,7 +1646,9 @@ au BufNewFile,BufRead */etc/systemd/system/*.d/*.conf setf systemd au BufNewFile,BufRead */.config/systemd/user/*.d/*.conf setf systemd " Systemd temp files au BufNewFile,BufRead */etc/systemd/system/*.d/.#* setf systemd +au BufNewFile,BufRead */etc/systemd/system/.#* setf systemd au BufNewFile,BufRead */.config/systemd/user/*.d/.#* setf systemd +au BufNewFile,BufRead */.config/systemd/user/.#* setf systemd " Synopsys Design Constraints au BufNewFile,BufRead *.sdc setf sdc |