IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.0067: syntax highlighting not working when re-entering a buffer

Browse Source 
Problem:    Syntax highlighting not working when re-entering a buffer.
Solution:   Do force executing autocommands when not called recursively.
a5616b0136
This commit is contained in:
Jan Edmund Lazo 2018-09-30 02:53:18 -04:00
parent 6a680548ec
commit 9dcd5bd9c5
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/nvim/option.c
View File

@ -3237,20 +3237,28 @@ did_set_string_option (
*/ */
/* When 'syntax' is set, load the syntax of that name */ /* When 'syntax' is set, load the syntax of that name */
if (varp == &(curbuf->b_p_syn)) { if (varp == &(curbuf->b_p_syn)) {
// Only pass true for "force" when the value changed, to avoid static int syn_recursive = 0;
// endless recurrence.
apply_autocmds(EVENT_SYNTAX, curbuf->b_p_syn, syn_recursive++;
curbuf->b_fname, value_changed, curbuf); // Only pass true for "force" when the value changed or not used
// recursively, to avoid endless recurrence.
apply_autocmds(EVENT_SYNTAX, curbuf->b_p_syn, curbuf->b_fname,
value_changed || syn_recursive == 1, curbuf);
syn_recursive--;
} else if (varp == &(curbuf->b_p_ft)) { } else if (varp == &(curbuf->b_p_ft)) {
// 'filetype' is set, trigger the FileType autocommand // 'filetype' is set, trigger the FileType autocommand
// Skip this when called from a modeline and the filetype was // Skip this when called from a modeline and the filetype was
// already set to this value. // already set to this value.
// Only pass true for "force" when the value changed, to avoid
// endless recurrence.
if (!(opt_flags & OPT_MODELINE) || value_changed) { if (!(opt_flags & OPT_MODELINE) || value_changed) {
static int ft_recursive = 0;
ft_recursive++;
did_filetype = true; did_filetype = true;
apply_autocmds(EVENT_FILETYPE, curbuf->b_p_ft, // Only pass true for "force" when the value changed or not
curbuf->b_fname, value_changed, curbuf); // used recursively, to avoid endless recurrence.
apply_autocmds(EVENT_FILETYPE, curbuf->b_p_ft, curbuf->b_fname,
value_changed || ft_recursive == 1, curbuf);
ft_recursive--;
// Just in case the old "curbuf" is now invalid // Just in case the old "curbuf" is now invalid
if (varp != &(curbuf->b_p_ft)) { if (varp != &(curbuf->b_p_ft)) {
varp = NULL; varp = NULL;