Merge from origin/emacs-29

c8ea14e7825 Handle quoted tilde in Tramp
30239759ee4 ; Set maintainer for elint.el to emacs-devel
eedd9db6190 Update to Org 9.6.10

# Conflicts:
#	lisp/net/tramp-gvfs.el

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

diff --cc lisp/net/tramp-gvfs.el
index 227571b148b12e8a4c34d71a88836178623be44b,07390b50df246f61f34120a3e024348fc4143931..451c033a044eb8d781cd327f4d123e6ec89f3f56
--- 1/lisp/net/tramp-gvfs.el
--- 2/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@@ -1208,9 -1176,13 +1208,12 @@@ file names.
        (tramp-run-real-handler #'expand-file-name (list name))
      ;; Dissect NAME.
      (with-parsed-tramp-file-name name nil
+       ;; Tilde expansion shall be possible also for quoted localname.
+       (when (string-prefix-p "~" (file-name-unquote localname))
+       (setq localname (file-name-unquote localname)))
        ;; If there is a default location, expand tilde.
        (when (string-match
 -           (tramp-compat-rx bos "~" (group (* (not "/"))) (group (* nonl)) eos)
 -           localname)
 +           (rx bos "~" (group (* (not "/"))) (group (* nonl)) eos) localname)
        (let ((uname (match-string 1 localname))
              (fname (match-string 2 localname))
              hname)

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

diff --cc lisp/net/tramp-smb.el
index f3f2c40e62c989e9d5223b06a967074776249b44,0ba24352a3dd1b5f8030d945ed1753c44f69e6f4..ac1b29f08cd34623022c0903f15f5c1386eb2daf
--- 1/lisp/net/tramp-smb.el
--- 2/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@@ -722,9 -731,13 +722,12 @@@ PRESERVE-UID-GID and PRESERVE-EXTENDED-
        (tramp-run-real-handler #'expand-file-name (list name))
      ;; Dissect NAME.
      (with-parsed-tramp-file-name name nil
+       ;; Tilde expansion shall be possible also for quoted localname.
+       (when (string-prefix-p "~" (file-name-unquote localname))
+       (setq localname (file-name-unquote localname)))
        ;; Tilde expansion if necessary.
        (when (string-match
 -           (tramp-compat-rx bos "~" (group (* (not "/"))) (group (* nonl)) eos)
 -           localname)
 +           (rx bos "~" (group (* (not "/"))) (group (* nonl)) eos) localname)
        (let ((uname (match-string 1 localname))
              (fname (match-string 2 localname))
              hname)

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

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

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

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