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

diff --cc .gitignore
Simple merge

diff --cc Makefile.in
Simple merge

diff --cc configure.ac
Simple merge

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

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

diff --cc lisp/faces.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/mwheel.el
Simple merge

diff --cc lisp/net/browse-url.el
Simple merge

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

diff --cc lisp/server.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc lisp/url/url-privacy.el
Simple merge

diff --cc src/.gdbinit
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/atimer.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/font.c
Simple merge

diff --cc src/font.h
Simple merge

diff --cc src/frame.c
Simple merge

diff --cc src/frame.h
Simple merge

diff --cc src/fringe.c
Simple merge

diff --cc src/ftcrfont.c
Simple merge

diff --cc src/gtkutil.c
Simple merge

diff --cc src/gtkutil.h
Simple merge

diff --cc src/image.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/menu.c
Simple merge

diff --cc src/menu.h
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/termhooks.h
Simple merge

diff --cc src/terminal.c
Simple merge

diff --cc src/window.h
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xfaces.c
Simple merge

diff --cc src/xsettings.c
Simple merge

diff --cc src/xsettings.h
Simple merge

diff --cc src/xwidget.c
Simple merge