diff options
| author | Glenn Morris <rgm@gnu.org> | 2021-10-29 09:20:05 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2021-10-29 09:20:05 -0700 |
| commit | faa2a990c980bfdedbc76520083f1228806f3df2 (patch) | |
| tree | 664ba25a64ed8150d3950271d15c3177acdda48e /lisp/net | |
| parent | 65e71d9a8aac231be71992d1011641acab1c1e14 (diff) | |
| parent | 52e7049b5818c2f71dba66b9e05d9798a2051864 (diff) | |
| download | emacs-faa2a990c980bfdedbc76520083f1228806f3df2.tar.gz emacs-faa2a990c980bfdedbc76520083f1228806f3df2.tar.bz2 emacs-faa2a990c980bfdedbc76520083f1228806f3df2.zip | |
Merge from origin/emacs-28
52e7049b58 * lisp/loadup.el: Unbreak build.
91e7df281e Move lisp/shorthands.el to lisp/emacs-lisp/shorthands.el
00103154e0 Some Tramp changes, mainly in tramp-tests.el
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/tramp-gvfs.el | 6 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index ebe57a8bcec..7e226398d1f 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el @@ -1866,7 +1866,11 @@ Their full names are \"org.gtk.vfs.MountTracker.mounted\" and port (tramp-file-name-port v))))) (when (member method tramp-gvfs-methods) (with-parsed-tramp-file-name - (tramp-make-tramp-file-name method user domain host port "") nil + ;; This must be changed when we throw the old signature + ;; away in Emacs 27.1 and higher. + (with-no-warnings + (tramp-make-tramp-file-name method user domain host port "")) + nil (tramp-message v 6 "%s %s" signal-name (tramp-gvfs-stringify-dbus-message mount-info)) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 372e0a2cb73..b152584c1f8 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -1758,6 +1758,9 @@ the form (METHOD USER DOMAIN HOST PORT LOCALNAME &optional HOP)." tramp-postfix-host-format localname))) +(set-advertised-calling-convention + #'tramp-make-tramp-file-name '(vec &optional localname hop) "27.1") + (defun tramp-make-tramp-hop-name (vec) "Construct a Tramp hop name from VEC." (replace-regexp-in-string |