diff options
| author | Richard M. Stallman | 1997-05-06 03:42:02 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1997-05-06 03:42:02 +0000 |
| commit | 3ee4159a4e77c957178791ca394266ab5e1ab235 (patch) | |
| tree | dac12e8c81437db956f1af31a163726f9f8751bf /src | |
| parent | 396a830c5e1c05bf63f78f1080d75b249ee38cf6 (diff) | |
| download | emacs-3ee4159a4e77c957178791ca394266ab5e1ab235.tar.gz emacs-3ee4159a4e77c957178791ca394266ab5e1ab235.zip | |
(display_text_line): Clear region_showing to Qnil if the
window should not show a region.
(redisplay_internal): Do update region_showing when ! all_windows.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xdisp.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index e777336e6c7..37cf8f18208 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -1270,6 +1270,15 @@ update: | |||
| 1270 | w->last_had_star | 1270 | w->last_had_star |
| 1271 | = (BUF_MODIFF (XBUFFER (w->buffer)) > BUF_SAVE_MODIFF (XBUFFER (w->buffer)) | 1271 | = (BUF_MODIFF (XBUFFER (w->buffer)) > BUF_SAVE_MODIFF (XBUFFER (w->buffer)) |
| 1272 | ? Qt : Qnil); | 1272 | ? Qt : Qnil); |
| 1273 | |||
| 1274 | /* Record if we are showing a region, so can make sure to | ||
| 1275 | update it fully at next redisplay. */ | ||
| 1276 | w->region_showing = (!NILP (Vtransient_mark_mode) | ||
| 1277 | && w == XWINDOW (current_buffer->last_selected_window) | ||
| 1278 | && !NILP (XBUFFER (w->buffer)->mark_active) | ||
| 1279 | ? Fmarker_position (XBUFFER (w->buffer)->mark) | ||
| 1280 | : Qnil); | ||
| 1281 | |||
| 1273 | w->window_end_valid = w->buffer; | 1282 | w->window_end_valid = w->buffer; |
| 1274 | last_arrow_position = Voverlay_arrow_position; | 1283 | last_arrow_position = Voverlay_arrow_position; |
| 1275 | last_arrow_string = Voverlay_arrow_string; | 1284 | last_arrow_string = Voverlay_arrow_string; |
| @@ -2850,7 +2859,10 @@ display_text_line (w, start, vpos, hpos, taboffset, ovstr_done) | |||
| 2850 | w->region_showing = Qt; | 2859 | w->region_showing = Qt; |
| 2851 | } | 2860 | } |
| 2852 | else | 2861 | else |
| 2853 | region_beg = region_end = -1; | 2862 | { |
| 2863 | region_beg = region_end = -1; | ||
| 2864 | w->region_showing = Qnil; | ||
| 2865 | } | ||
| 2854 | 2866 | ||
| 2855 | if (MINI_WINDOW_P (w) | 2867 | if (MINI_WINDOW_P (w) |
| 2856 | && start == BEG | 2868 | && start == BEG |