master d9b309c: Merge from origin/emacs-28

[Eli Zaretskii]

branch: master
commit d9b309cda8b946e8bf9760f66070a83e0fa37e77
Merge: 54b8ec4 335a660
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge from origin/emacs-28
    
    335a660b4b Fix display glitches with side-by-side windows on TTY frames
    4a96f32def Avoid replacing common prefix with ellipsis
---
 lisp/progmodes/python.el | 2 ++
 src/dispnew.c            | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 49b8a86..34bff01 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -3703,6 +3703,8 @@ def __PYTHON_EL_native_completion_setup():
             readline.parse_and_bind('tab: complete')
             # Require just one tab to send output.
             readline.parse_and_bind('set show-all-if-ambiguous on')
+            # Avoid replacing common prefix with ellipsis.
+            readline.parse_and_bind('set completion-prefix-display-length 0')
 
         print ('python.el: native completion setup loaded')
     except:
diff --git a/src/dispnew.c b/src/dispnew.c
index c3f6d0b..4a73244 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -475,7 +475,8 @@ adjust_glyph_matrix (struct window *w, struct glyph_matrix 
*matrix, int x, int y
                = row->glyphs[TEXT_AREA] + dim.width - left - right;
              /* Leave room for a border glyph.  */
              if (!FRAME_WINDOW_P (XFRAME (w->frame))
-                 && !WINDOW_RIGHTMOST_P (w))
+                 && !WINDOW_RIGHTMOST_P (w)
+                 && right > 0)
                row->glyphs[RIGHT_MARGIN_AREA] -= 1;
              row->glyphs[LAST_AREA]
                = row->glyphs[LEFT_MARGIN_AREA] + dim.width;
@@ -1148,7 +1149,8 @@ prepare_desired_row (struct window *w, struct glyph_row 
*row, bool mode_line_p)
          row->glyphs[RIGHT_MARGIN_AREA] = row->glyphs[LAST_AREA] - right;
          /* Leave room for a border glyph.  */
          if (!FRAME_WINDOW_P (XFRAME (w->frame))
-             && !WINDOW_RIGHTMOST_P (w))
+             && !WINDOW_RIGHTMOST_P (w)
+             && right > 0)
            row->glyphs[RIGHT_MARGIN_AREA] -= 1;
        }
     }