From: Joakim Verona <joakim@verona.se>
Date: Wed, 15 Feb 2012 14:12:49 +0000 (+0100)
Subject: upstream
X-Git-Tag: emacs-25.0.90~3336
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/02db17e53bf46c91b2cb8ee33b43d8ae252a1681

upstream
---

02db17e53bf46c91b2cb8ee33b43d8ae252a1681
diff --cc lisp/emacs-lisp/cl-loaddefs.el
index c729ca2261,5bb86628bb..dd9ee259b6
--- a/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 a3b58d648a,95e7d8a568..b50ae71df8
--- a/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;