summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-01-27 22:47:09 +0100
committerBram Moolenaar <Bram@vim.org>2020-01-27 22:47:09 +0100
commitf8ddb25789a6af530e69f499907979dfbff1c1ea (patch)
treed20b612c3e627b4b7021bd8b8c6eb99094684593
parent89bfc8218c1b3f41cc5d0fe06afd7d0fb2bd5dc6 (diff)
downloadvim-git-f8ddb25789a6af530e69f499907979dfbff1c1ea.tar.gz
patch 8.2.0161: not recognizing .gv file as dot filetypev8.2.0161
Problem: Not recognizing .gv file as dot filetype. Solution: Add *.gv to dot pattern. (closes #5544)
-rw-r--r--[-rwxr-xr-x]runtime/doc/evim-it.10
-rw-r--r--[-rwxr-xr-x]runtime/doc/vim-it.10
-rw-r--r--[-rwxr-xr-x]runtime/doc/vimdiff-it.10
-rw-r--r--[-rwxr-xr-x]runtime/doc/vimtutor-it.10
-rw-r--r--[-rwxr-xr-x]runtime/doc/xxd-it.10
-rw-r--r--runtime/filetype.vim2
-rw-r--r--[-rwxr-xr-x]runtime/ftplugin/swift.vim0
-rw-r--r--[-rwxr-xr-x]runtime/ftplugin/swiftgyb.vim0
-rw-r--r--[-rwxr-xr-x]runtime/indent/lifelines.vim0
-rw-r--r--[-rwxr-xr-x]runtime/syntax/sil.vim0
-rw-r--r--[-rwxr-xr-x]runtime/syntax/swift.vim0
-rw-r--r--[-rwxr-xr-x]runtime/syntax/swiftgyb.vim0
-rw-r--r--src/testdir/test_filetype.vim2
-rw-r--r--src/version.c2
14 files changed, 4 insertions, 2 deletions
diff --git a/runtime/doc/evim-it.1 b/runtime/doc/evim-it.1
index 1e98a2d3f..1e98a2d3f 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 0ab3eff0d..0ab3eff0d 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 2203877ac..2203877ac 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 b5c1e61e0..b5c1e61e0 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 1fb4ae5e8..1fb4ae5e8 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 d8184faee..1347c42b2 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 26d04eb5f..26d04eb5f 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 8e8fc2b79..8e8fc2b79 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 0d9b2b46e..0d9b2b46e 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 5583497f1..5583497f1 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 533d3fb7a..533d3fb7a 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 566b75b2e..566b75b2e 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 0916f5cff..2bd85344b 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 562b5fbed..a87ca0703 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,