Mercurial > emacs
changeset 20258:ebebe05191b4
(display_text_line): Make decision about which windows
highlight the region in just once place.
When minibuffer is selected, show the region in the previous window,
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Sat, 15 Nov 1997 20:24:41 +0000 |
| parents | 7ba68c0e1bee |
| children | 0393daff516c |
| files | src/xdisp.c |
| diffstat | 1 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xdisp.c Sat Nov 15 20:23:21 1997 +0000 +++ b/src/xdisp.c Sat Nov 15 20:24:41 1997 +0000 @@ -2895,11 +2895,10 @@ && !WINDOW_FULL_WIDTH_P (w)) || !NILP (current_buffer->truncate_lines)); - /* 1 if we should highlight the region. */ + /* 1 if this buffer has a region to highlight. */ int highlight_region = (!NILP (Vtransient_mark_mode) && !NILP (current_buffer->mark_active) - && (XWINDOW (current_buffer->last_selected_window) == w - || highlight_nonselected_windows)); + && XMARKER (current_buffer->mark)->buffer != 0); int region_beg, region_end; int selective = (INTEGERP (current_buffer->selective_display) @@ -2959,10 +2958,12 @@ if (tab_width <= 0 || tab_width > 1000) tab_width = 8; /* Show where to highlight the region. */ - if (highlight_region && XMARKER (current_buffer->mark)->buffer != 0 + if (highlight_region /* Maybe highlight only in selected window. */ && (highlight_nonselected_windows - || w == XWINDOW (selected_window))) + || w == XWINDOW (selected_window) + || (MINI_WINDOW_P (XWINDOW (selected_window)) + && w == XWINDOW (Vminibuf_scroll_window)))) { region_beg = marker_position (current_buffer->mark); if (PT < region_beg)