Merge from origin/emacs-29

07c45f20fd3 Fix test in files-tests
5d3f3288d22 ; * doc/emacs/search.texi (Regexp Backslash): Improve ind...
9525315c117 Add missing :version to two defcustoms
9044d4d94bb Fix a defcustom :type in eldoc.el
8141d73ea7f Document 'M-x align' in the Emacs manual

diff --cc doc/emacs/emacs.texi
Simple merge

diff --cc doc/emacs/search.texi
Simple merge

diff --cc lisp/emacs-lisp/eldoc.el
Simple merge

diff --cc test/lisp/files-tests.el
Simple merge