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

Conflicts:
	src/print.c

diff --cc src/keyboard.c
Simple merge

diff --cc src/print.c
index fd943b94efd6b395a0dcbe4bb795d3567756b8ed,206466ce68f0db4cd5c93a34d01d78f58cc00237..d826fb764f9d9e7089133495889231befffedb9c
--- 1/src/print.c
--- 2/src/print.c
+++ b/src/print.c
@@@ -37,10 -37,7 +37,11 @@@ along with GNU Emacs.  If not, see <htt
  #include "termhooks.h"                /* For struct terminal.  */
  #include "font.h"
  
 +#ifdef HAVE_XWIDGETS
 +# include "xwidget.h"
 +#endif
 +
+ #include <c-ctype.h>
  #include <float.h>
  #include <ftoastr.h>
  

diff --cc src/xdisp.c
Simple merge

diff --cc src/xterm.c
Simple merge