On 16-Oct-2019 23:39, Bram Moolenaar wrote:
Patch 8.1.2153
Problem: Combining text property and syntax highlight is wrong. (Nick
Jensen)
Solution: Compute the syntax highlight attribute much earlier.
(closes #5057)
Files: src/drawline.c, src/testdir/test_textprop.vim,
src/testdir/dumps/Test_textprop_syn_1.dump
After patches 2153 to 2161 (I'm pretty sure that 2153 is culprit)
mingw64 (gcc 9.2.1) throws this error if FEAT_SPELL is not defined:
gcc -c -I. -Iproto -DWIN32 -DWINVER=0x0603 -D_WIN32_WINNT=0x0603
-DHAVE_PATHDEF -DFEAT_NORMAL -DHAVE_STDINT_H -DFEAT_GUI_MSWIN
-DFEAT_CLIPBOARD -pipe -march=native -Wall -O3 -fomit-frame-pointer
-freg-struct-return drawline.c -o gobjnative/drawline.o
drawline.c: In function 'win_line':
drawline.c:1424:4: error: 'can_spell' undeclared (first use in this
function); did you mean 'ex_spell'?
1424 | can_spell = TRUE;
| ^~~~~~~~~
| ex_spell
drawline.c:1424:4: note: each undeclared identifier is reported only
once for each function it appears in
make: *** [Make_cyg_ming.mak:1104: gobjnative/drawline.o] Error 1
make: Target 'gvim.exe' not remade because of errors.
The attached patch seems to correct it.
Cheers
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups "vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/42d6d1eb-bb38-ed2a-e015-0133277c87fc%40internode.on.net.
--- drawline.c.orig 2019-10-17 05:09:29.805114800 +1100
+++ drawline.c 2019-10-17 05:31:51.835006400 +1100
@@ -1421,7 +1421,9 @@
syntax_attr = prev_syntax_attr;
else
{
+# ifdef FEAT_SPELL
can_spell = TRUE;
+# endif
syntax_attr = get_syntax_attr((colnr_T)v,
# ifdef FEAT_SPELL
has_spell ? &can_spell :
