summaryrefslogtreecommitdiffstats
path: root/syntax/json.vim
diff options
context:
space:
mode:
authorAdam Stankiewicz <sheerun@sher.pl>2019-09-06 15:54:31 +0200
committerAdam Stankiewicz <sheerun@sher.pl>2019-09-06 15:54:31 +0200
commit48e07bc5014fecfdff24f75124a65634c216c9e2 (patch)
tree2e16f9a515364e27ac451acbc313b1d7ca518790 /syntax/json.vim
parentc8897c9c18ee79d3780dd352aee34bf6498c625d (diff)
downloadvim-polyglot-48e07bc5014fecfdff24f75124a65634c216c9e2.tar.gz
vim-polyglot-48e07bc5014fecfdff24f75124a65634c216c9e2.zip
Improve guard to support concatenated files
Diffstat (limited to 'syntax/json.vim')
-rw-r--r--syntax/json.vim6
1 files changed, 2 insertions, 4 deletions
diff --git a/syntax/json.vim b/syntax/json.vim
index 49a8df7b..fb279a3f 100644
--- a/syntax/json.vim
+++ b/syntax/json.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'json') != -1
- finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'json') == -1
" Vim syntax file
" Language: JSON
" Maintainer: Eli Parra <eli@elzr.com> https://github.com/elzr/vim-json
@@ -141,3 +138,4 @@ endif
"The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
"THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
"See https://twitter.com/elzr/status/294964017926119424
+endif