From: Michael Albinus <michael.albinus@gmx.de>
Date: Sat, 26 Jun 2021 14:26:02 +0000 (+0200)
Subject: Fix Tramp bug#49229
X-Git-Tag: emacs-28.0.90~2021
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d4561201891a53b7536fae98862b04535a1489c4;p=emacs.git

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)
---

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 0f15e4a20b5..c3b088aebb7 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.