[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master d456120: Fix Tramp bug#49229
From: |
Michael Albinus |
Subject: |
master d456120: Fix Tramp bug#49229 |
Date: |
Sat, 26 Jun 2021 10:26:11 -0400 (EDT) |
branch: master
commit d4561201891a53b7536fae98862b04535a1489c4
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>
Fix Tramp bug#49229
* lisp/net/tramp.el (tramp-file-name-handler): Drop possible
volume letter when `expand-file-name' is called with a local
absolute file name as first argument. (Bug#49229)
---
lisp/net/tramp.el | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 0f15e4a..c3b088a 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2610,7 +2610,14 @@ Fall back to normal file name handler if no Tramp file
name handler exists."
;; When `tramp-mode' is not enabled, or the file name is quoted,
;; we don't do anything.
- (tramp-run-real-handler operation args))))
+ ;; When operation is `expand-file-name', and the first argument
+ ;; is a local absolute file name, we end also here. Handle the
+ ;; MS Windows case.
+ (funcall
+ (if (and (eq operation 'expand-file-name)
+ (not (string-match-p "\\`[[:alpha:]]:/" (car args))))
+ #'tramp-drop-volume-letter #'identity)
+ (tramp-run-real-handler operation args)))))
(defun tramp-completion-file-name-handler (operation &rest args)
"Invoke Tramp file name completion handler for OPERATION and ARGS.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master d456120: Fix Tramp bug#49229,
Michael Albinus <=