Merge from origin/emacs-28

1b8719835a Update to Org 9.5.4
92c5faafd7 Clarify documentation of 'string-to-unibyte'
2848512654 ; * lisp/files.el (find-file): Avoid too short lines in do...
672f9f787f Improve keystrokes in doc strings in some find-file functions
ef5651cc77 Fix segfaults when starting on 80x26 TTY frames
bfa647972f ; Fix doc string of 'delete-selection-repeat-replace-region'
a95d46e00f Make it explicit that a couple of _s in lispref are unders...
5c74c25123 Remove from FAQ the MS-Windows info about BDF fonts
edb48646f2 Fix Display Property manual example

diff --cc doc/lispref/control.texi
Simple merge

diff --cc doc/lispref/display.texi
Simple merge

diff --cc doc/lispref/strings.texi
Simple merge

diff --cc doc/misc/efaq.texi
Simple merge

diff --cc lisp/delsel.el
Simple merge

diff --cc lisp/files.el
Simple merge

diff --cc lisp/org/org-clock.el
Simple merge

diff --cc lisp/org/org.el
Simple merge

diff --cc src/dispnew.c
Simple merge