diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-07-27 21:39:13 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-07-27 21:39:13 +0200 |
| commit | 4248111497ab78f45d3d48576740949778a1e76b (patch) | |
| tree | b739e16ef4a60b5c0513472576ffe6166471887e | |
| parent | 9800bfe0fc7596e8fee97172139f0777bac639fb (diff) | |
| download | vim-git-4248111497ab78f45d3d48576740949778a1e76b.tar.gz | |
patch 8.1.1761: filetype "vuejs" causes problems for some usersv8.1.1761
Problem: Filetype "vuejs" causes problems for some users.
Solution: Rename to "vue".
| -rw-r--r-- | runtime/filetype.vim | 3 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 80fa02196..43c085838 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -710,6 +710,9 @@ au BufNewFile,BufRead *.html,*.htm,*.shtml,*.stm call dist#ft#FThtml() " Vue.js Single File Component au BufNewFile,BufRead *.vue setf vuejs +" Vue.js Single File Component +au BufNewFile,BufRead *.vue setf vue + " HTML with Ruby - eRuby au BufNewFile,BufRead *.erb,*.rhtml setf eruby diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 37d8ceda9..c455c65a5 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -475,6 +475,7 @@ let s:filename_checks = { \ 'voscm': ['file.cm'], \ 'vrml': ['file.wrl'], \ 'vroom': ['file.vroom'], + \ 'vue': ['file.vue'], \ 'wast': ['file.wast', 'file.wat'], \ 'webmacro': ['file.wm'], \ 'wget': ['.wgetrc', 'wgetrc'], diff --git a/src/version.c b/src/version.c index 4b89a31f1..b1d7fea6f 100644 --- a/src/version.c +++ b/src/version.c @@ -778,6 +778,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1761, +/**/ 1760, /**/ 1759, |