Merge 8.6. Some further indenting fixes #432

Job	Run time
build (gcc)	1m 40s
test (gcc)	3m 54s
build (gcc, CFLAGS=-DTK_NO_DEPRECATED=1)	1m 44s
test (gcc, --disable-xft)	3m 49s
build (gcc, --disable-xft)	4m 27s
test (gcc, --enable-symbols)	3m 26s
build (gcc, --disable-xss)	1m 40s
build (gcc, --enable-symbols)	1m 15s
build (clang)	1m 59s
build (clang, CFLAGS=-DTK_NO_DEPRECATED=1)	2m 38s
build (clang, --disable-xft)	1m 53s
build (clang, --disable-xss)	2m 1s
build (clang, --enable-symbols)	1m 27s
	31m 53s

Provide feedback