diff options
| author | Richard M. Stallman | 1996-09-02 05:19:13 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1996-09-02 05:19:13 +0000 |
| commit | 2bf32c5d8ac9dab03029c6f2ed7054838f6a561e (patch) | |
| tree | 237d1c2d23eaf6ffe5169af542e6c2dbd5d430d3 | |
| parent | 86e4843672eb5ac9f51161b4c67e73fe6e4cb4e0 (diff) | |
| download | emacs-2bf32c5d8ac9dab03029c6f2ed7054838f6a561e.tar.gz emacs-2bf32c5d8ac9dab03029c6f2ed7054838f6a561e.zip | |
(redisplay_internal): Test last_selected_window slot.
(mark_window_display_accurate, display_text_line): Likewise.
| -rw-r--r-- | src/xdisp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 4af129f7ca4..ab78039032c 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -1023,6 +1023,7 @@ redisplay_internal (preserve_echo_area) | |||
| 1023 | then we can't just move the cursor. */ | 1023 | then we can't just move the cursor. */ |
| 1024 | else if (! (!NILP (Vtransient_mark_mode) | 1024 | else if (! (!NILP (Vtransient_mark_mode) |
| 1025 | && !NILP (current_buffer->mark_active)) | 1025 | && !NILP (current_buffer->mark_active)) |
| 1026 | && w == XWINDOW (current_buffer->last_selected_window) | ||
| 1026 | && NILP (w->region_showing) | 1027 | && NILP (w->region_showing) |
| 1027 | && !cursor_in_echo_area) | 1028 | && !cursor_in_echo_area) |
| 1028 | { | 1029 | { |
| @@ -1279,6 +1280,7 @@ mark_window_display_accurate (window, flag) | |||
| 1279 | /* Record if we are showing a region, so can make sure to | 1280 | /* Record if we are showing a region, so can make sure to |
| 1280 | update it fully at next redisplay. */ | 1281 | update it fully at next redisplay. */ |
| 1281 | w->region_showing = (!NILP (Vtransient_mark_mode) | 1282 | w->region_showing = (!NILP (Vtransient_mark_mode) |
| 1283 | && w == XWINDOW (current_buffer->last_selected_window) | ||
| 1282 | && !NILP (XBUFFER (w->buffer)->mark_active) | 1284 | && !NILP (XBUFFER (w->buffer)->mark_active) |
| 1283 | ? Fmarker_position (XBUFFER (w->buffer)->mark) | 1285 | ? Fmarker_position (XBUFFER (w->buffer)->mark) |
| 1284 | : Qnil); | 1286 | : Qnil); |
| @@ -2557,7 +2559,8 @@ display_text_line (w, start, vpos, hpos, taboffset) | |||
| 2557 | 2559 | ||
| 2558 | /* 1 if we should highlight the region. */ | 2560 | /* 1 if we should highlight the region. */ |
| 2559 | int highlight_region | 2561 | int highlight_region |
| 2560 | = !NILP (Vtransient_mark_mode) && !NILP (current_buffer->mark_active); | 2562 | = (!NILP (Vtransient_mark_mode) && !NILP (current_buffer->mark_active) |
| 2563 | && XWINDOW (current_buffer->last_selected_window) == w); | ||
| 2561 | int region_beg, region_end; | 2564 | int region_beg, region_end; |
| 2562 | 2565 | ||
| 2563 | int selective = (INTEGERP (current_buffer->selective_display) | 2566 | int selective = (INTEGERP (current_buffer->selective_display) |