diff options
| author | Eli Zaretskii | 2022-03-19 09:25:18 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2022-03-19 09:25:19 +0200 |
| commit | 9c68894399e928220192fd44efbd71a1ca116028 (patch) | |
| tree | b06a631c50dfe5a3ecd279afba9c34c257fa5ade /src | |
| parent | 43ee6f291d88453f0d6dec76fe80f4e7503abc81 (diff) | |
| parent | e059d7c156edb37a7c836906b9a3510adee3d543 (diff) | |
| download | emacs-9c68894399e928220192fd44efbd71a1ca116028.tar.gz emacs-9c68894399e928220192fd44efbd71a1ca116028.zip | |
Merge from origin/emacs-28
e059d7c Fix region highlight in non-selected windows
Diffstat (limited to 'src')
| -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 5cb58391dde..1e766e4a192 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -13209,9 +13209,12 @@ prepare_menu_bars (void) | |||
| 13209 | { | 13209 | { |
| 13210 | Lisp_Object this = XCAR (ws); | 13210 | Lisp_Object this = XCAR (ws); |
| 13211 | struct window *w = XWINDOW (this); | 13211 | struct window *w = XWINDOW (this); |
| 13212 | /* Cf. conditions for redisplaying a window at the | ||
| 13213 | beginning of redisplay_window. */ | ||
| 13212 | if (w->redisplay | 13214 | if (w->redisplay |
| 13213 | || XFRAME (w->frame)->redisplay | 13215 | || XFRAME (w->frame)->redisplay |
| 13214 | || XBUFFER (w->contents)->text->redisplay) | 13216 | || XBUFFER (w->contents)->text->redisplay |
| 13217 | || BUF_PT (XBUFFER (w->contents)) != w->last_point) | ||
| 13215 | { | 13218 | { |
| 13216 | windows = Fcons (this, windows); | 13219 | windows = Fcons (this, windows); |
| 13217 | } | 13220 | } |