master 9c68894399 1/3: Merge from origin/emacs-28

[Eli Zaretskii]

branch: master
commit 9c68894399e928220192fd44efbd71a1ca116028
Merge: 43ee6f291d e059d7c156
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge from origin/emacs-28
    
    e059d7c Fix region highlight in non-selected windows
---
 src/xdisp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/xdisp.c b/src/xdisp.c
index 5cb58391dd..1e766e4a19 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13209,9 +13209,12 @@ prepare_menu_bars (void)
            {
              Lisp_Object this = XCAR (ws);
              struct window *w = XWINDOW (this);
+             /* Cf. conditions for redisplaying a window at the
+                beginning of redisplay_window.  */
              if (w->redisplay
                  || XFRAME (w->frame)->redisplay
-                 || XBUFFER (w->contents)->text->redisplay)
+                 || XBUFFER (w->contents)->text->redisplay
+                 || BUF_PT (XBUFFER (w->contents)) != w->last_point)
                {
                  windows = Fcons (this, windows);
                }