upstream

diff --cc lisp/emacs-lisp/cl-loaddefs.el
index c729ca226103551d563199dd66e45fa9cc2efc96,5bb86628bb803b47cfa6f253bbb2efc7c747270d..dd9ee259b6da1f21eba29c7c3bedaa57567bb19c
--- 1/lisp/emacs-lisp/cl-loaddefs.el
--- 2/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@@ -286,7 -286,7 +286,7 @@@ This also does some trivial optimizatio
  ;;;;;;  flet progv psetq do-all-symbols do-symbols dotimes dolist
  ;;;;;;  do* do loop return-from return block etypecase typecase ecase
  ;;;;;;  case load-time-value eval-when destructuring-bind function*
- ;;;;;;  defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "d823fe159b79b4f85f49a3fbe463d848")
 -;;;;;;  defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "91b45885535a73dd8015973cb8c988e1")
++;;;;;;  defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "045f9588e561616741b5f9aef96ce7df")
  ;;; Generated autoloads from cl-macs.el
  
  (autoload 'gensym "cl-macs" "\

diff --cc src/window.c
index a3b58d648a1e2de710f12af23a56d2ee9a0efbd7,95e7d8a5685e3f1c860b63b0e3cc83cc193863cb..b50ae71df8c6706bec6243d9a6a2cb678e2c48aa
--- 1/src/window.c
--- 2/src/window.c
+++ b/src/window.c
@@@ -3888,13 -3886,18 +3888,21 @@@ Signal an error when WINDOW is the onl
        && EQ (r->new_total, (horflag ? r->total_cols : r->total_lines)))
      /* We can delete WINDOW now.  */
      {
+       Mouse_HLInfo *hlinfo;
+ 
        /* Block input.  */
        BLOCK_INPUT;
 +#ifdef HAVE_XWIDGETS
 +      xwidget_view_delete_all_in_window(w);
 +#endif
        window_resize_apply (p, horflag);
  
+       /* If this window is referred to by the dpyinfo's mouse
+        highlight, invalidate that slot to be safe (Bug#9904).  */
+       hlinfo = MOUSE_HL_INFO (XFRAME (w->frame));
+       if (EQ (hlinfo->mouse_face_window, window))
+       hlinfo->mouse_face_window = Qnil;
+ 
        windows_or_buffers_changed++;
        Vwindow_list = Qnil;
        FRAME_WINDOW_SIZES_CHANGED (f) = 1;

diff --cc src/xdisp.c
Simple merge