m-vim_plugins/vim-polyglot
1
0
Fork 0
mirror of https://github.com/sheerun/vim-polyglot.git synced 2025-11-11 13:03:50 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve disabling ftdetect

Browse Source
This commit is contained in:
Adam Stankiewicz
2021-01-01 17:00:28 +01:00
parent d6678a1b35
commit 7219196dba
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ftdetect/polyglot.vim
View File

@@ -14,11 +14,6 @@ let did_load_polyglot = 1
let s:cpo_save = &cpo let s:cpo_save = &cpo
set cpo&vim set cpo&vim
" It can happen vim filetype.vim loads first, then we need a reset
if exists("did_load_filetypes")
au! filetypedetect
endif
let g:polyglot_is_disabled = {} let g:polyglot_is_disabled = {}
let s:new_polyglot_disabled = [] let s:new_polyglot_disabled = []
@@ -48,9 +43,6 @@ endfun
au VimEnter * call PolyglotVerify() au VimEnter * call PolyglotVerify()
" Prevent filetype.vim of vim from loading again
let did_load_filetypes = 1
" Be consistent across different systems " Be consistent across different systems
set nofileignorecase set nofileignorecase
@@ -142,6 +134,15 @@ set cpo&vim
if !has_key(g:polyglot_is_disabled, 'ftdetect') if !has_key(g:polyglot_is_disabled, 'ftdetect')
" It can happen vim filetype.vim loads first, then we need a reset
if exists("did_load_filetypes")
au! filetypedetect
endif
" Prevent filetype.vim of vim from loading again
let did_load_filetypes = 1
" DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
if !has_key(g:polyglot_is_disabled, 'jsonc') if !has_key(g:polyglot_is_disabled, 'jsonc')
@@ -2657,8 +2658,6 @@ endif
" DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE " DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE
endif
func! s:Observe(fn) func! s:Observe(fn)
let b:PolyglotObserve = function("polyglot#" . a:fn) let b:PolyglotObserve = function("polyglot#" . a:fn)
augroup polyglot-observer augroup polyglot-observer
@@ -2677,6 +2676,7 @@ au BufWritePost * au! polyglot-observer
augroup END augroup END
endif
if !has_key(g:polyglot_is_disabled, 'sensible') if !has_key(g:polyglot_is_disabled, 'sensible')
" Use 2-spaces tab indentation by default " Use 2-spaces tab indentation by default