Merge from origin/emacs-29

b875c9bf67e Fix file-regular-p in Tramp
63fa225d443 Merge branch 'emacs-29' of git.savannah.gnu.org:/srv/git/...
9f5d6c541e5 ; * doc/emacs/custom.texi (Init Rebinding): Fix wording i...
a91b435d0d5 ; Reword user documentation on binding keys in Lisp
0400de6a7de Fix typo in c-ts-mode (bug#60932)

diff --cc lisp/net/tramp.el
Simple merge

diff --cc test/lisp/net/tramp-archive-tests.el
Simple merge

diff --cc test/lisp/net/tramp-tests.el
index 0932a53f4b1b39112c64f8b1f503b260d9846435,ff0fc56043e26685f5f1dbeaafdb719617fcdb95..60545e7270f72ba1d42f52848bf817723850aff0
--- 1/test/lisp/net/tramp-tests.el
--- 2/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@@ -4084,9 -4088,11 +4097,10 @@@ This tests also `make-symbolic-link', `
                       "/[penguin/motd]" "/penguin:motd:")))
              (delete-file tmp-name2)
              (make-symbolic-link
 -             (funcall
 -              (if quoted #'tramp-compat-file-name-unquote #'identity) penguin)
 +             (funcall (if quoted #'file-name-unquote #'identity) penguin)
               tmp-name2)
              (should (file-symlink-p tmp-name2))
+             (should-not (file-regular-p tmp-name2))
              (should
               (string-equal
                (file-truename tmp-name2)