Merge remote-tracking branch 'origin/master' into xwidget_mvp

diff --cc configure.ac
index 71fa6886b1fc06e9fc24df44296ecc8109ba070d,94007a495379bbc0a1ea855c96f855835df06e50..ec5e7800448008d6fa2b9a8c21a6590ed3cf9829
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -5285,10 -5288,8 +5330,11 @@@ AS_ECHO(["  Does Emacs use -lXaw3d
    Does Emacs use -lotf?                                   ${HAVE_LIBOTF}
    Does Emacs use -lxft?                                   ${HAVE_XFT}
    Does Emacs directly use zlib?                           ${HAVE_ZLIB}
+   Does Emacs have dynamic modules support?                ${HAVE_MODULES}
    Does Emacs use toolkit scroll bars?                     ${USE_TOOLKIT_SCROLL_BARS}
 +  Does Emacs support Xwidgets?                            ${HAVE_XWIDGETS}
 +      Does xwidgets support webkit(requires gtk3)?        ${HAVE_WEBKIT}
 +      Does xwidgets support gobject introspection?        ${HAVE_GIR}
  "])
  
  if test -n "${EMACSDATA}"; then

diff --cc src/Makefile.in
Simple merge

diff --cc src/dispnew.c
Simple merge

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

diff --cc src/xdisp.c
Simple merge