mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-08 12:28:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #10329 from janlazo/vim-8.1.0437

Browse Source 
vim-patch:8.0.1535,8.1.{198,437,1342}
This commit is contained in:
Justin M. Keyes
2019-06-25 13:58:48 +02:00
committed by GitHub
parent 615fc68263 ace7e4e11b
commit 027ebb23da
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/ops.c
View File

@@ -3749,7 +3749,7 @@ int do_join(size_t count,
if (setmark) { if (setmark) {
// Set the '] mark. // Set the '] mark.
curwin->w_buffer->b_op_end.lnum = curwin->w_cursor.lnum; curwin->w_buffer->b_op_end.lnum = curwin->w_cursor.lnum;
curwin->w_buffer->b_op_end.col = (colnr_T)STRLEN(newp); curwin->w_buffer->b_op_end.col = sumsize;
} }
/* Only report the change in the first line here, del_lines() will report /* Only report the change in the first line here, del_lines() will report

14
src/nvim/syntax.c
View File

@@ -997,6 +997,7 @@ static void syn_stack_free_block(synblock_T *block)
clear_syn_state(p); clear_syn_state(p);
} }
XFREE_CLEAR(block->b_sst_array); XFREE_CLEAR(block->b_sst_array);
block->b_sst_first = NULL;
block->b_sst_len = 0; block->b_sst_len = 0;
} }
} }
@@ -1108,9 +1109,6 @@ static void syn_stack_apply_changes_block(synblock_T *block, buf_T *buf)
synstate_T *p, *prev, *np; synstate_T *p, *prev, *np;
linenr_T n; linenr_T n;
if (block->b_sst_array == NULL) /* nothing to do */
return;
prev = NULL; prev = NULL;
for (p = block->b_sst_first; p != NULL; ) { for (p = block->b_sst_first; p != NULL; ) {
if (p->sst_lnum + block->b_syn_sync_linebreaks > buf->b_mod_top) { if (p->sst_lnum + block->b_syn_sync_linebreaks > buf->b_mod_top) {
@@ -1158,8 +1156,9 @@ static int syn_stack_cleanup(void)
int dist; int dist;
int retval = FALSE; int retval = FALSE;
if (syn_block->b_sst_array == NULL || syn_block->b_sst_first == NULL) if (syn_block->b_sst_first == NULL) {
return retval; return retval;
}
/* Compute normal distance between non-displayed entries. */ /* Compute normal distance between non-displayed entries. */
if (syn_block->b_sst_len <= Rows) if (syn_block->b_sst_len <= Rows)
@@ -2923,8 +2922,9 @@ static int syn_regexec(regmmatch_T *rmp, linenr_T lnum, colnr_T col, syn_time_T
if (r > 0) if (r > 0)
++st->match; ++st->match;
} }
if (timed_out) { if (timed_out && !syn_win->w_s->b_syn_slow) {
syn_win->w_s->b_syn_slow = true; syn_win->w_s->b_syn_slow = true;
MSG(_("'redrawtime' exceeded, syntax highlighting disabled"));
} }
if (r > 0) { if (r > 0) {
@@ -3124,11 +3124,11 @@ static void syn_cmd_iskeyword(exarg_T *eap, int syncing)
arg = skipwhite(arg); arg = skipwhite(arg);
if (*arg == NUL) { if (*arg == NUL) {
MSG_PUTS("\n"); MSG_PUTS("\n");
MSG_PUTS(_("syntax iskeyword "));
if (curwin->w_s->b_syn_isk != empty_option) { if (curwin->w_s->b_syn_isk != empty_option) {
MSG_PUTS(_("syntax iskeyword "));
msg_outtrans(curwin->w_s->b_syn_isk); msg_outtrans(curwin->w_s->b_syn_isk);
} else { } else {
msg_outtrans((char_u *)"not set"); msg_outtrans((char_u *)_("syntax iskeyword not set"));
} }
} else { } else {
if (STRNICMP(arg, "clear", 5) == 0) { if (STRNICMP(arg, "clear", 5) == 0) {

2
src/nvim/testdir/test_syntax.vim
View File

@@ -466,6 +466,8 @@ func Test_bg_detection()
set bg=dark set bg=dark
hi Normal ctermbg=12 hi Normal ctermbg=12
call assert_equal('dark', &bg) call assert_equal('dark', &bg)
hi Normal ctermbg=NONE
endfunc endfunc
fun Test_synstack_synIDtrans() fun Test_synstack_synIDtrans()