From f2bf8376aefbd27113e16869b461732d87c84fa6 Mon Sep 17 00:00:00 2001 From: delphinus Date: Mon, 12 Aug 2019 18:51:06 +0900 Subject: [PATCH] Fix #639: Use more careful way to enable `numhl` The development versions of v0.3.2 also report `has('nvim-0.3.2')` to be true even if they do not support the `numhl` feature. So here it catches and ignores the possible errors. --- autoload/gitgutter/highlight.vim | 33 +++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/autoload/gitgutter/highlight.vim b/autoload/gitgutter/highlight.vim index 2b2e313..0066d01 100644 --- a/autoload/gitgutter/highlight.vim +++ b/autoload/gitgutter/highlight.vim @@ -172,21 +172,24 @@ endfunction function! s:define_sign_linenr_highlights() abort if has('nvim-0.3.2') - if g:gitgutter_highlight_linenrs - sign define GitGutterLineAdded numhl=GitGutterAddLineNr - sign define GitGutterLineModified numhl=GitGutterChangeLineNr - sign define GitGutterLineRemoved numhl=GitGutterDeleteLineNr - sign define GitGutterLineRemovedFirstLine numhl=GitGutterDeleteLineNr - sign define GitGutterLineRemovedAboveAndBelow numhl=GitGutterDeleteLineNr - sign define GitGutterLineModifiedRemoved numhl=GitGutterChangeDeleteLineNr - else - sign define GitGutterLineAdded numhl= - sign define GitGutterLineModified numhl= - sign define GitGutterLineRemoved numhl= - sign define GitGutterLineRemovedFirstLine numhl= - sign define GitGutterLineRemovedAboveAndBelow numhl= - sign define GitGutterLineModifiedRemoved numhl= - endif + try + if g:gitgutter_highlight_linenrs + sign define GitGutterLineAdded numhl=GitGutterAddLineNr + sign define GitGutterLineModified numhl=GitGutterChangeLineNr + sign define GitGutterLineRemoved numhl=GitGutterDeleteLineNr + sign define GitGutterLineRemovedFirstLine numhl=GitGutterDeleteLineNr + sign define GitGutterLineRemovedAboveAndBelow numhl=GitGutterDeleteLineNr + sign define GitGutterLineModifiedRemoved numhl=GitGutterChangeDeleteLineNr + else + sign define GitGutterLineAdded numhl= + sign define GitGutterLineModified numhl= + sign define GitGutterLineRemoved numhl= + sign define GitGutterLineRemovedFirstLine numhl= + sign define GitGutterLineRemovedAboveAndBelow numhl= + sign define GitGutterLineModifiedRemoved numhl= + endif + catch /E475/ + endtry endif endfunction