merge master

diff --cc configure.ac
Simple merge

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

diff --cc lisp/erc/erc-pcomplete.el
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/emacsgtkfixed.c
Simple merge

diff --cc src/emacsgtkfixed.h
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/print.c
Simple merge

diff --cc src/termhooks.h
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xterm.c
Simple merge