diff options
| author | Paul Eggert | 2016-01-30 11:28:37 -0800 |
|---|---|---|
| committer | Paul Eggert | 2016-01-30 11:28:37 -0800 |
| commit | 2b41d6a979b0ea361e078891b8763b4ae7be8092 (patch) | |
| tree | aef17169e9bf8e59baa82ec7df5c1b64139d9c9f /src/window.c | |
| parent | fe9c8b687c5121a413342024b62824a86d2de2be (diff) | |
| parent | 71468e00735a44e19814a73e8f9013c0f272c342 (diff) | |
| download | emacs-2b41d6a979b0ea361e078891b8763b4ae7be8092.tar.gz emacs-2b41d6a979b0ea361e078891b8763b4ae7be8092.zip | |
-
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/window.c b/src/window.c index add2de38d18..70b7e58feb5 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -35,15 +35,13 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 35 | #include "dispextern.h" | 35 | #include "dispextern.h" |
| 36 | #include "blockinput.h" | 36 | #include "blockinput.h" |
| 37 | #include "termhooks.h" /* For FRAME_TERMINAL. */ | 37 | #include "termhooks.h" /* For FRAME_TERMINAL. */ |
| 38 | #include "xwidget.h" | ||
| 38 | #ifdef HAVE_WINDOW_SYSTEM | 39 | #ifdef HAVE_WINDOW_SYSTEM |
| 39 | #include TERM_HEADER | 40 | #include TERM_HEADER |
| 40 | #endif /* HAVE_WINDOW_SYSTEM */ | 41 | #endif /* HAVE_WINDOW_SYSTEM */ |
| 41 | #ifdef MSDOS | 42 | #ifdef MSDOS |
| 42 | #include "msdos.h" | 43 | #include "msdos.h" |
| 43 | #endif | 44 | #endif |
| 44 | #ifdef HAVE_XWIDGETS | ||
| 45 | # include "xwidget.h" | ||
| 46 | #endif | ||
| 47 | 45 | ||
| 48 | static ptrdiff_t count_windows (struct window *); | 46 | static ptrdiff_t count_windows (struct window *); |
| 49 | static ptrdiff_t get_leaf_windows (struct window *, struct window **, | 47 | static ptrdiff_t get_leaf_windows (struct window *, struct window **, |
| @@ -4371,9 +4369,7 @@ Signal an error when WINDOW is the only window on its frame. */) | |||
| 4371 | 4369 | ||
| 4372 | /* Block input. */ | 4370 | /* Block input. */ |
| 4373 | block_input (); | 4371 | block_input (); |
| 4374 | #ifdef HAVE_XWIDGETS | ||
| 4375 | xwidget_view_delete_all_in_window (w); | 4372 | xwidget_view_delete_all_in_window (w); |
| 4376 | #endif | ||
| 4377 | window_resize_apply (p, horflag); | 4373 | window_resize_apply (p, horflag); |
| 4378 | /* If this window is referred to by the dpyinfo's mouse | 4374 | /* If this window is referred to by the dpyinfo's mouse |
| 4379 | highlight, invalidate that slot to be safe (Bug#9904). */ | 4375 | highlight, invalidate that slot to be safe (Bug#9904). */ |