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

diff --cc configure.ac
Simple merge

diff --cc src/buffer.c
index cdf6c7241b61830f3f4f7f6175469cc6f7381f1b,fc2ee82e4475dc3e04eb1f914208d467a30d32da..88a47a62b01dafc538734206f07deaf82f985620
--- 1/src/buffer.c
--- 2/src/buffer.c
+++ b/src/buffer.c
@@@ -1754,15 -1744,8 +1747,13 @@@ cleaning up all windows currently displ
    /* Unlock this buffer's file, if it is locked.  */
    unlock_buffer (b);
  
-   GCPRO1 (buffer);
    kill_buffer_processes (buffer);
-   UNGCPRO;
  
 +#ifdef HAVE_XWIDGETS
 +  GCPRO1 (buffer);
 +  kill_buffer_xwidgets (buffer);
 +  UNGCPRO;
 +#endif
    /* Killing buffer processes may run sentinels which may have killed
       our buffer.  */
    if (!BUFFER_LIVE_P (b))

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

diff --cc src/xterm.c
Simple merge