Fix merge conflict #427

Job	Run time
test (gcc)	3m 54s
build (gcc)	1m 37s
test (gcc, --disable-xft)	3m 46s
build (gcc, CFLAGS=-DTK_NO_DEPRECATED=1)	1m 54s
test (gcc, --enable-symbols)	3m 26s
build (gcc, --disable-xft)	1m 39s
build (gcc, --disable-xss)	1m 39s
build (gcc, --enable-symbols)	1m 13s
build (clang)	1m 48s
build (clang, CFLAGS=-DTK_NO_DEPRECATED=1)	1m 50s
build (clang, --disable-xft)	1m 50s
build (clang, --disable-xss)	1m 54s
build (clang, --enable-symbols)	1m 26s
	27m 56s

Provide feedback