From: Michael Albinus Date: Fri, 13 Oct 2023 14:18:06 +0000 (+0200) Subject: Merge from origin/emacs-29 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bbccef3ceb63bc17ab9d2aee5326df5d70ce4ab3;p=emacs.git 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 --- bbccef3ceb63bc17ab9d2aee5326df5d70ce4ab3 diff --cc lisp/net/tramp-gvfs.el index 227571b148b,07390b50df2..451c033a044 --- a/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-smb.el index f3f2c40e62c,0ba24352a3d..ac1b29f08cd --- a/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)