Mercurial > vim
diff src/Makefile @ 12210:b9b06aa0b6d9 v8.0.0985
patch 8.0.0985: libvterm has its own idea of character width
commit https://github.com/vim/vim/commit/6d0826dfbba9880820d9ec221327e4250bbf6540
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Aug 22 22:12:17 2017 +0200
patch 8.0.0985: libvterm has its own idea of character width
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)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Tue, 22 Aug 2017 22:15:04 +0200 |
parents | 5d82470552ce |
children | 03e4be2e3d53 |
line wrap: on
line diff
--- 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