[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 8b861b0: Merge from origin/emacs-28
From: |
Michael Albinus |
Subject: |
master 8b861b0: Merge from origin/emacs-28 |
Date: |
Mon, 1 Nov 2021 07:32:32 -0400 (EDT) |
branch: master
commit 8b861b07cf9d41da15f751b996d88d7079653508
Merge: 567fa8d ba4daf2
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>
Merge from origin/emacs-28
ba4daf2214 Adapt arguments of `tramp-make-tramp-file-name'
a34466731b Fix typo in describe-map-tree doc string
---
lisp/help.el | 4 ++--
lisp/net/tramp-gvfs.el | 9 +++------
lisp/obsolete/rcompile.el | 6 +++++-
lisp/url/url-tramp.el | 10 ++++++----
4 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/lisp/help.el b/lisp/help.el
index d12f388..19cd773 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -1250,10 +1250,10 @@ If NOMENU is non-nil, then omit menu-bar commands.
If TRANSL is non-nil, the definitions are actually key
translations so print strings and vectors differently.
-If ALWAYS_TITLE is non-nil, print the title even if there are no
+If ALWAYS-TITLE is non-nil, print the title even if there are no
maps to look through.
-If MENTION_SHADOW is non-nil, then when something is shadowed by
+If MENTION-SHADOW is non-nil, then when something is shadowed by
SHADOW, don't omit it; instead, mention it but say it is
shadowed."
(let* ((amaps (accessible-keymaps startmap prefix))
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index 7e22639..cab912b 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -1865,12 +1865,9 @@ Their full names are
\"org.gtk.vfs.MountTracker.mounted\" and
host (tramp-file-name-host v)
port (tramp-file-name-port v)))))
(when (member method tramp-gvfs-methods)
- (with-parsed-tramp-file-name
- ;; 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
+ (let ((v (make-tramp-file-name
+ :method method :user user :domain domain
+ :host host :port port)))
(tramp-message
v 6 "%s %s"
signal-name (tramp-gvfs-stringify-dbus-message mount-info))
diff --git a/lisp/obsolete/rcompile.el b/lisp/obsolete/rcompile.el
index ff7d1dc..c8fb9f2 100644
--- a/lisp/obsolete/rcompile.el
+++ b/lisp/obsolete/rcompile.el
@@ -109,6 +109,9 @@ nil means run no commands."
;;;; entry point
;; We use the Tramp internal function `tramp-make-tramp-file-name'.
+;; It has changed its signature in Emacs 27.1, supporting still the
+;; old calling convention. Let's assume rcompile.el has been removed
+;; once Tramp does not support it any longer.
;; Better would be, if there are functions to provide user, host and
;; localname of a remote filename, independent of Tramp's implementation.
;; The function calls are wrapped by `funcall' in order to pacify the byte
@@ -167,7 +170,8 @@ See \\[compile]."
(with-current-buffer compilation-last-buffer
(when (fboundp 'tramp-make-tramp-file-name)
(set (make-local-variable 'comint-file-name-prefix)
- (tramp-make-tramp-file-name
+ (funcall
+ #'tramp-make-tramp-file-name
nil ;; method.
remote-compile-user
remote-compile-host
diff --git a/lisp/url/url-tramp.el b/lisp/url/url-tramp.el
index 5b9dd8a..5cf0d80 100644
--- a/lisp/url/url-tramp.el
+++ b/lisp/url/url-tramp.el
@@ -48,12 +48,14 @@ In case URL is not convertible, nil is returned."
(when (url-password obj)
(password-cache-add
(tramp-make-tramp-file-name
- (url-type obj) (url-user obj) nil
- (url-host obj) port "")
+ (make-tramp-file-name
+ :method (url-type obj) :user (url-user obj)
+ :host (url-host obj)))
(url-password obj)))
(tramp-make-tramp-file-name
- (url-type obj) (url-user obj) nil
- (url-host obj) port (url-filename obj)))))
+ (make-tramp-file-name
+ :method (url-type obj) :user (url-user obj)
+ :host (url-host obj) :port port :localname (url-filename obj))))))
(defun url-tramp-convert-tramp-to-url (file)
"Convert FILE, a Tramp file name, to a URL.