summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/net/tramp.el9
1 files changed, 8 insertions, 1 deletions
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.