From 5b4d271de3f796252c861927ca4fba221474c8c7 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 13 May 2025 14:45:04 +0300 Subject: [PATCH] Eglot: Fix parsing file:// URIs on MS-Windows * lisp/progmodes/eglot.el (eglot-uri-to-path): Remove the leading slash in MS-Windows file names only if they begin with a slash. This adjusts the function to the recent fix for bug#76982 in 'url-generic-parse-url', which previously would produce file names that begin with an extra slash. (Bug#78392) (cherry picked from commit b3e280faba98d2ca7e4feef1017e3bebf53f036a) --- lisp/progmodes/eglot.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index 9a1f5cce4e6..7447d8c71e5 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -1163,7 +1163,8 @@ object." ;; Remove the leading "/" for local MS Windows-style paths. (normalized (if (and (not remote-prefix) (eq system-type 'windows-nt) - (cl-plusp (length retval))) + (cl-plusp (length retval)) + (eq (aref retval 0) ?/)) (w32-long-file-name (substring retval 1)) retval))) (concat remote-prefix normalized)) -- 2.39.5