upstream

diff --cc configure.ac
Simple merge

diff --cc lib-src/movemail.c
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/termhooks.h
Simple merge

diff --cc src/xdisp.c
Simple merge