From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.bugs Subject: bug#44608: [PATCH] speedbar bugfix: only replace '~/' when it appears at the beginning of the path Date: Fri, 13 Nov 2020 11:08:18 +0100 Message-ID: <87y2j5tvql.fsf@igel.home> References: <20201113004609.1227253-1-dlenski@gmail.com> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="40729"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) Cc: 44608@debbugs.gnu.org To: Daniel Lenski Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Nov 13 11:09:11 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kdW10-000AUH-Me for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 13 Nov 2020 11:09:10 +0100 Original-Received: from localhost ([::1]:40060 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdW0z-0003KC-Ap for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 13 Nov 2020 05:09:09 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:58652) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdW0s-0003Jf-2g for bug-gnu-emacs@gnu.org; Fri, 13 Nov 2020 05:09:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:35121) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kdW0r-0000uB-Q3 for bug-gnu-emacs@gnu.org; Fri, 13 Nov 2020 05:09:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kdW0r-0008If-Je for bug-gnu-emacs@gnu.org; Fri, 13 Nov 2020 05:09:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Andreas Schwab Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 13 Nov 2020 10:09:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44608 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 44608-submit@debbugs.gnu.org id=B44608.160526210531851 (code B ref 44608); Fri, 13 Nov 2020 10:09:01 +0000 Original-Received: (at 44608) by debbugs.gnu.org; 13 Nov 2020 10:08:25 +0000 Original-Received: from localhost ([127.0.0.1]:46667 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kdW0H-0008He-Ff for submit@debbugs.gnu.org; Fri, 13 Nov 2020 05:08:25 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.9]:38909) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kdW0E-0008HU-A9 for 44608@debbugs.gnu.org; Fri, 13 Nov 2020 05:08:23 -0500 Original-Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4CXZ11055xz1qsk3; Fri, 13 Nov 2020 11:08:20 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4CXZ105Yfzz1tF6y; Fri, 13 Nov 2020 11:08:20 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id FwlQ4ZEXHcOg; Fri, 13 Nov 2020 11:08:19 +0100 (CET) X-Auth-Info: knopwKbfNiLBP2E8ve3JpWS3R14pt/41v2XhCfnxj5vyIqmv9aTveK7x9Sjcg9za Original-Received: from igel.home (ppp-46-244-182-209.dynamic.mnet-online.de [46.244.182.209]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Fri, 13 Nov 2020 11:08:19 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 1000) id 02C842C3357; Fri, 13 Nov 2020 11:08:18 +0100 (CET) X-Yow: My TOYOTA is built like a ... BAGEL with CREAM CHEESE!! In-Reply-To: <20201113004609.1227253-1-dlenski@gmail.com> (Daniel Lenski's message of "Thu, 12 Nov 2020 16:46:09 -0800") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:193221 Archived-At: On Nov 12 2020, Daniel Lenski wrote: > This makes Speedbar work correctly with remote directories accessed through TRAMP. This bug has apparently been known for a long time: https://cedet-devel.narkive.com/eIs7LoWB/speedbar-and-tramp#post2 > > Signed-off-by: Daniel Lenski > --- > lisp/speedbar.el | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/lisp/speedbar.el b/lisp/speedbar.el > index 991c8a3..3542936 100644 > --- a/lisp/speedbar.el > +++ b/lisp/speedbar.el > @@ -1874,7 +1874,7 @@ 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-match (concat "^" (regexp-quote tilde)) dd)) That should use string-prefix-p. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And now for something completely different."