Merge from origin/emacs-28

335a660b4b Fix display glitches with side-by-side windows on TTY frames
4a96f32def Avoid replacing common prefix with ellipsis

diff --cc lisp/progmodes/python.el
Simple merge

diff --cc src/dispnew.c
Simple merge