Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk

diff --cc configure.ac
Simple merge

diff --cc lisp/cus-edit.el
Simple merge

diff --cc lisp/frame.el
Simple merge

diff --cc lisp/international/mule-cmds.el
Simple merge

diff --cc lisp/loadup.el
Simple merge

diff --cc lisp/menu-bar.el
Simple merge

diff --cc lisp/net/eww.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/font.c
Simple merge

diff --cc src/frame.c
Simple merge

diff --cc src/frame.h
Simple merge

diff --cc src/image.c
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/window.h
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xfaces.c
Simple merge