diff options
| author | Kim F. Storm | 2006-11-27 16:00:59 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2006-11-27 16:00:59 +0000 |
| commit | 4b0d2020724ab789911bccfbf652d12307aa69b8 (patch) | |
| tree | 8a93835ee782007dece3858f3697f65cecdf512a /src/window.c | |
| parent | 89692b9ad69ae7571e1c05665fd1da07b846115a (diff) | |
| download | emacs-4b0d2020724ab789911bccfbf652d12307aa69b8.tar.gz emacs-4b0d2020724ab789911bccfbf652d12307aa69b8.zip | |
(set_window_buffer): Refactor recent changes.
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/window.c b/src/window.c index f1a0cb55072..0db51c58eda 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -3267,8 +3267,7 @@ set_window_buffer (window, buffer, run_hooks_p, keep_margins_p) | |||
| 3267 | int count = SPECPDL_INDEX (); | 3267 | int count = SPECPDL_INDEX (); |
| 3268 | #ifdef HAVE_WINDOW_SYSTEM | 3268 | #ifdef HAVE_WINDOW_SYSTEM |
| 3269 | struct frame *f = XFRAME (w->frame); | 3269 | struct frame *f = XFRAME (w->frame); |
| 3270 | Display_Info *dpyinfo = (f && FRAME_X_OUTPUT (f)) ? | 3270 | Display_Info *dpyinfo; |
| 3271 | FRAME_X_DISPLAY_INFO (f) : NULL; | ||
| 3272 | #endif | 3271 | #endif |
| 3273 | 3272 | ||
| 3274 | w->buffer = buffer; | 3273 | w->buffer = buffer; |
| @@ -3352,7 +3351,9 @@ set_window_buffer (window, buffer, run_hooks_p, keep_margins_p) | |||
| 3352 | 3351 | ||
| 3353 | #ifdef HAVE_WINDOW_SYSTEM | 3352 | #ifdef HAVE_WINDOW_SYSTEM |
| 3354 | BLOCK_INPUT; | 3353 | BLOCK_INPUT; |
| 3355 | if (dpyinfo && EQ (window, dpyinfo->mouse_face_window)) | 3354 | if (f && FRAME_X_OUTPUT (f) |
| 3355 | && (dpyinfo = FRAME_X_DISPLAY_INFO (f)) | ||
| 3356 | && EQ (window, dpyinfo->mouse_face_window)) | ||
| 3356 | clear_mouse_face (dpyinfo); | 3357 | clear_mouse_face (dpyinfo); |
| 3357 | UNBLOCK_INPUT; | 3358 | UNBLOCK_INPUT; |
| 3358 | #endif | 3359 | #endif |