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

diff --cc configure.ac
index 815d3c98c3a6c699075a1747b2c43fc446e004f0,bea2833809079efd1400cbb5f45dc301d313fad6..369d4f467621fd3ca86ca14bab7e9c25944f18e7
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -5750,12 -5677,14 +5756,14 @@@ Configured for '${canonical}'
    Where do we find X Windows header files?                ${x_includes:-$emacs_standard_dirs}
    Where do we find X Windows libraries?                   ${x_libraries:-$emacs_standard_dirs}"])
  
+ #### Please respect alphabetical ordering when making additions.
  optsep=
  emacs_config_features=
- for opt in XAW3D XPM JPEG TIFF GIF PNG RSVG CAIRO IMAGEMAGICK SOUND GPM DBUS \
-   GCONF GSETTINGS GLIB NOTIFY ACL LIBSELINUX GNUTLS LIBXML2 FREETYPE HARFBUZZ M17N_FLT \
-   LIBOTF XFT ZLIB TOOLKIT_SCROLL_BARS X_TOOLKIT OLDXMENU PGTK X11 XDBE XIM \
-   NS MODULES THREADS XWIDGETS LIBSYSTEMD JSON PDUMPER UNEXEC LCMS2 GMP; do
+ for opt in ACL CAIRO DBUS FREETYPE GCONF GIF GLIB GMP GNUTLS GPM GSETTINGS \
+  HARFBUZZ IMAGEMAGICK JPEG JSON LCMS2 LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 \
 - M17N_FLT MODULES NOTIFY NS OLDXMENU PDUMPER PNG RSVG SOUND THREADS TIFF \
++ M17N_FLT MODULES NOTIFY NS OLDXMENU PDUMPER PGTK PNG RSVG SOUND THREADS TIFF \
+  TOOLKIT_SCROLL_BARS UNEXEC X11 XAW3D XDBE XFT XIM XPM XWIDGETS X_TOOLKIT \
+  ZLIB; do
  
      case $opt in
        PDUMPER) val=${with_pdumper} ;;

diff --cc lisp/frame.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/frame.c
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/termhooks.h
Simple merge

diff --cc src/window.h
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xfaces.c
Simple merge