Fix `speedbar-directory-buttons' when using Tramp

* lisp/speedbar.el (speedbar-directory-buttons): Make speedbar
work with directories accessed via Tramp (bug#44622).

Copyright-paperwork-exempt: yes

diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 991c8a33d46cbde5454bbd18acf86bcdb144e9de..3619b23d9e6b15bec964cb5d35eee5c725aaaa32 100644 (file)
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -1874,9 +1874,9 @@ matches the user directory ~, then it is replaced with a ~.
 INDEX is not used, but is required by the caller."
   (let* ((tilde (expand-file-name "~/"))
         (dd (expand-file-name directory))
-        (junk (string-match (regexp-quote tilde) dd))
+        (junk (string-prefix-p "~/" dd))
         (displayme (if junk
-                       (concat "~/" (substring dd (match-end 0)))
+                       (concat "~/" (substring dd 2 nil))
                      dd))
         (p (point)))
     (if (string-match "^~[/\\]?\\'" displayme) (setq displayme tilde))