Merge branch 'trunk' into xwidget

[gnu-emacs] / src / window.c

diff --git a/src/window.c b/src/window.c
index 2ff149ed4fa43b33726ba741a87ff8a64b399e5f..f66099c1b9bc5a696f992a2cbde5e00581482708 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -52,6 +52,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifdef HAVE_NS
 #include "nsterm.h"
 #endif
+#ifdef HAVE_XWIDGETS
+#include "xwidget.h"
+#endif
 
 Lisp_Object Qwindowp, Qwindow_live_p;
 static Lisp_Object Qwindow_valid_p;
@@ -4058,6 +4061,9 @@ Signal an error when WINDOW is the only window on its frame.  */)
 
       /* 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