diff options
author | Bram Moolenaar <Bram@vim.org> | 2017-08-22 22:12:17 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2017-08-22 22:12:17 +0200 |
commit | 6d0826dfbba9880820d9ec221327e4250bbf6540 (patch) | |
tree | 4cc32379c4c21b3dfced4bc8339d8541188cf18f /src/Make_cyg_ming.mak | |
parent | 5830232c021102e47a4e6fc81857604e4a031ddf (diff) |
patch 8.0.0985: libvterm has its own idea of character widthv8.0.0985
Problem: Libvterm has its own idea of character width.
Solution: Use the Vim functions for character width and composing to avoid a
mismatch. (idea by Yasuhiro Matsumoto)
Diffstat (limited to 'src/Make_cyg_ming.mak')
-rw-r--r-- | src/Make_cyg_ming.mak | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index 5b0719f7d9..1c368badf1 100644 --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -971,7 +971,11 @@ $(OUTDIR)/terminal.o: terminal.c $(INCL) $(TERM_DEPS) $(CC) -c $(CFLAGS) terminal.c -o $(OUTDIR)/terminal.o -CCCTERM = $(CC) -c $(CFLAGS) -Ilibvterm/include -DINLINE="" -DVSNPRINTF=vim_vsnprintf +CCCTERM = $(CC) -c $(CFLAGS) -Ilibvterm/include -DINLINE="" \ + -DVSNPRINTF=vim_vsnprintf \ + -DIS_COMBINING_FUNCTION=utf_iscomposing_uint \ + -DWCWIDTH_FUNCTION=utf_uint2cells + $(OUTDIR)/term_encoding.o: libvterm/src/encoding.c $(TERM_DEPS) $(CCCTERM) libvterm/src/encoding.c -o $@ |