From e951bcedf635eb17139762651eea44637ef00f51 Mon Sep 17 00:00:00 2001 From: Konfekt Date: Wed, 28 Jul 2021 11:40:33 +0200 Subject: [PATCH] use vimtex#util#trim() instead of trim() for Vim versions < 8.1 The two occurrences of trim() in https://github.com/lervag/vimtex/blob/1782e479a0c6a716af3a92d5ed85b65ecfad3dc0/autoload/vimtex/parser/bib.vim#L34 and https://github.com/lervag/vimtex/blob/3807da1c530e46fb6a633a2268f6e435b16b657b/autoload/vimtex/fold/bib.vim#L24 are replaced by https://github.com/lervag/vimtex/blob/6228f72a8bcf25b31bf1a966de864349ed4ea61c/autoload/vimtex/util.vim#L192 for Vim versions < 8.1. This creates dependencies outside of the bib file, but they have been there before anyway. --- autoload/vimtex/fold/bib.vim | 2 +- autoload/vimtex/parser/bib.vim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/autoload/vimtex/fold/bib.vim b/autoload/vimtex/fold/bib.vim index cbc927c303..4edcf12318 100644 --- a/autoload/vimtex/fold/bib.vim +++ b/autoload/vimtex/fold/bib.vim @@ -21,7 +21,7 @@ endfunction function! vimtex#fold#bib#level(lnum) abort " {{{1 " Handle blank lines - if empty(trim(getline(a:lnum))) + if empty(vimtex#util#trim(getline(a:lnum))) if a:lnum == 1 | return 0 | endif let l:prev_level = vimtex#fold#bib#level(a:lnum - 1) diff --git a/autoload/vimtex/parser/bib.vim b/autoload/vimtex/parser/bib.vim index e722559fc1..2fe299ebbe 100644 --- a/autoload/vimtex/parser/bib.vim +++ b/autoload/vimtex/parser/bib.vim @@ -31,7 +31,7 @@ function! vimtex#parser#bib#parse_cheap(start_line, end_line, opts) abort " {{{1 let l:entries = [] let l:firstlines = filter( \ range(a:start_line, a:end_line), - \ {_, i -> trim(getline(i))[0] == "@"}) + \ {_, i -> vimtex#util#trim(getline(i))[0] == "@"}) let l:total_entries = len(l:firstlines) let l:entry_lines = map(l:firstlines, {idx, val -> [val, \ idx == l:total_entries - 1