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/Makefile | |
| parent | 5830232c021102e47a4e6fc81857604e4a031ddf (diff) | |
| download | vim-git-6d0826dfbba9880820d9ec221327e4250bbf6540.tar.gz | |
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/Makefile')
| -rw-r--r-- | src/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile index 1f252f056..e4da3b4b6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3296,7 +3296,11 @@ objects/channel.o: channel.c Makefile: @echo The name of the makefile MUST be "Makefile" (with capital M)!!!! -CCCTERM = $(CCC) -Ilibvterm/include -DINLINE="" -DVSNPRINTF=vim_vsnprintf +CCCTERM = $(CCC) -Ilibvterm/include -DINLINE="" \ + -DVSNPRINTF=vim_vsnprintf \ + -DIS_COMBINING_FUNCTION=utf_iscomposing_uint \ + -DWCWIDTH_FUNCTION=utf_uint2cells + objects/term_encoding.o: libvterm/src/encoding.c $(TERM_DEPS) $(CCCTERM) -o $@ libvterm/src/encoding.c |