Mercurial > emacs
comparison src/xdisp.c @ 43575:250eb7f4849d
(init_iterator): Compare with Vminibuf_selected_window
instead of Vminibuf_scroll_window when deciding in which window
the region should be highlighted. Consequently, the region remains
highlighted even when a completion buffer is also displayed.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Tue, 26 Feb 2002 22:55:08 +0000 |
parents | 63a1bfc01817 |
children | b7964dae2379 73660db97f3e |
comparison
equal
deleted
inserted
replaced
43574:b14fc05f010f | 43575:250eb7f4849d |
---|---|
1580 /* Or show region in the selected window. */ | 1580 /* Or show region in the selected window. */ |
1581 || w == XWINDOW (selected_window) | 1581 || w == XWINDOW (selected_window) |
1582 /* Or show the region if we are in the mini-buffer and W is | 1582 /* Or show the region if we are in the mini-buffer and W is |
1583 the window the mini-buffer refers to. */ | 1583 the window the mini-buffer refers to. */ |
1584 || (MINI_WINDOW_P (XWINDOW (selected_window)) | 1584 || (MINI_WINDOW_P (XWINDOW (selected_window)) |
1585 && WINDOWP (Vminibuf_scroll_window) | 1585 && WINDOWP (Vminibuf_selected_window) |
1586 && w == XWINDOW (Vminibuf_scroll_window)))) | 1586 && w == XWINDOW (Vminibuf_selected_window)))) |
1587 { | 1587 { |
1588 int charpos = marker_position (current_buffer->mark); | 1588 int charpos = marker_position (current_buffer->mark); |
1589 it->region_beg_charpos = min (PT, charpos); | 1589 it->region_beg_charpos = min (PT, charpos); |
1590 it->region_end_charpos = max (PT, charpos); | 1590 it->region_end_charpos = max (PT, charpos); |
1591 } | 1591 } |