upstream

diff --cc autogen/configure
Simple merge

diff --cc configure.in
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xterm.c
Simple merge