From 40d2ed9bab2d1c060f50f0c23b3dda47a846f764 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 18 Oct 2022 19:39:34 +0200 Subject: [PATCH] * lisp/net/tramp.el (tramp-file-name-equal-p): Fix docstring. --- lisp/net/tramp-integration.el | 2 ++ lisp/net/tramp.el | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lisp/net/tramp-integration.el b/lisp/net/tramp-integration.el index 4be019edd9d..78107e1a03b 100644 --- a/lisp/net/tramp-integration.el +++ b/lisp/net/tramp-integration.el @@ -125,6 +125,8 @@ been set up by `rfn-eshadow-setup-minibuffer'." ;; eshell.el keeps the path in `eshell-path-env'. We must change it ;; when `default-directory' points to another host. +;; This is fixed in Eshell with Emacs 29.1. + (defun tramp-eshell-directory-change () "Set `eshell-path-env' to $PATH of the host related to `default-directory'." ;; Remove last element of `(exec-path)', which is `exec-directory'. diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 4ff57e5d560..c06adb01e8c 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -1526,7 +1526,8 @@ same connection. Make a copy in order to avoid side effects." ;; Comparison of file names is performed by `tramp-equal-remote'. (defun tramp-file-name-equal-p (vec1 vec2) - "Check, whether VEC1 and VEC2 denote the same `tramp-file-name'." + "Check, whether VEC1 and VEC2 denote the same `tramp-file-name'. +LOCALNAME and HOP do not count." (and (tramp-file-name-p vec1) (tramp-file-name-p vec2) (equal (tramp-file-name-unify vec1) (tramp-file-name-unify vec2)))) -- 2.39.2