diff options
-rw-r--r--[-rwxr-xr-x] | runtime/doc/evim-it.1 | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | runtime/doc/vim-it.1 | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | runtime/doc/vimdiff-it.1 | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | runtime/doc/vimtutor-it.1 | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | runtime/doc/xxd-it.1 | 0 | ||||
-rw-r--r-- | runtime/filetype.vim | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | runtime/ftplugin/swift.vim | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | runtime/ftplugin/swiftgyb.vim | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | runtime/indent/lifelines.vim | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | runtime/syntax/sil.vim | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | runtime/syntax/swift.vim | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | runtime/syntax/swiftgyb.vim | 0 | ||||
-rw-r--r-- | src/testdir/test_filetype.vim | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
14 files changed, 4 insertions, 2 deletions
diff --git a/runtime/doc/evim-it.1 b/runtime/doc/evim-it.1 index 1e98a2d3f7..1e98a2d3f7 100755..100644 --- a/runtime/doc/evim-it.1 +++ b/runtime/doc/evim-it.1 diff --git a/runtime/doc/vim-it.1 b/runtime/doc/vim-it.1 index 0ab3eff0d2..0ab3eff0d2 100755..100644 --- a/runtime/doc/vim-it.1 +++ b/runtime/doc/vim-it.1 diff --git a/runtime/doc/vimdiff-it.1 b/runtime/doc/vimdiff-it.1 index 2203877acf..2203877acf 100755..100644 --- a/runtime/doc/vimdiff-it.1 +++ b/runtime/doc/vimdiff-it.1 diff --git a/runtime/doc/vimtutor-it.1 b/runtime/doc/vimtutor-it.1 index b5c1e61e01..b5c1e61e01 100755..100644 --- a/runtime/doc/vimtutor-it.1 +++ b/runtime/doc/vimtutor-it.1 diff --git a/runtime/doc/xxd-it.1 b/runtime/doc/xxd-it.1 index 1fb4ae5e80..1fb4ae5e80 100755..100644 --- a/runtime/doc/xxd-it.1 +++ b/runtime/doc/xxd-it.1 diff --git a/runtime/filetype.vim b/runtime/filetype.vim index d8184faee5..1347c42b2b 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -491,7 +491,7 @@ au BufNewFile,BufRead *.rul au BufNewFile,BufRead *.com call dist#ft#BindzoneCheck('dcl') " DOT -au BufNewFile,BufRead *.dot setf dot +au BufNewFile,BufRead *.dot,*.gv setf dot " Dylan - lid files au BufNewFile,BufRead *.lid setf dylanlid diff --git a/runtime/ftplugin/swift.vim b/runtime/ftplugin/swift.vim index 26d04eb5fa..26d04eb5fa 100755..100644 --- a/runtime/ftplugin/swift.vim +++ b/runtime/ftplugin/swift.vim diff --git a/runtime/ftplugin/swiftgyb.vim b/runtime/ftplugin/swiftgyb.vim index 8e8fc2b791..8e8fc2b791 100755..100644 --- a/runtime/ftplugin/swiftgyb.vim +++ b/runtime/ftplugin/swiftgyb.vim diff --git a/runtime/indent/lifelines.vim b/runtime/indent/lifelines.vim index 0d9b2b46e4..0d9b2b46e4 100755..100644 --- a/runtime/indent/lifelines.vim +++ b/runtime/indent/lifelines.vim diff --git a/runtime/syntax/sil.vim b/runtime/syntax/sil.vim index 5583497f1e..5583497f1e 100755..100644 --- a/runtime/syntax/sil.vim +++ b/runtime/syntax/sil.vim diff --git a/runtime/syntax/swift.vim b/runtime/syntax/swift.vim index 533d3fb7ac..533d3fb7ac 100755..100644 --- a/runtime/syntax/swift.vim +++ b/runtime/syntax/swift.vim diff --git a/runtime/syntax/swiftgyb.vim b/runtime/syntax/swiftgyb.vim index 566b75b2ed..566b75b2ed 100755..100644 --- a/runtime/syntax/swiftgyb.vim +++ b/runtime/syntax/swiftgyb.vim diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 0916f5cffe..2bd85344b7 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -139,7 +139,7 @@ let s:filename_checks = { \ 'dockerfile': ['Containerfile', 'Dockerfile', 'file.Dockerfile'], \ 'dosbatch': ['file.bat', 'file.sys'], \ 'dosini': ['.editorconfig', '/etc/yum.conf', 'file.ini'], - \ 'dot': ['file.dot'], + \ 'dot': ['file.dot', 'file.gv'], \ 'dracula': ['file.drac', 'file.drc', 'filelvs', 'filelpe'], \ 'dsl': ['file.dsl'], \ 'dtd': ['file.dtd'], diff --git a/src/version.c b/src/version.c index 562b5fbed3..a87ca0703c 100644 --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 161, +/**/ 160, /**/ 159, |