From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Daniel Lenski Newsgroups: gmane.emacs.bugs Subject: bug#44608: [PATCH] speedbar bugfix: only replace '~/' when it appears at the beginning of the path Date: Thu, 12 Nov 2020 16:46:09 -0800 Message-ID: <20201113004609.1227253-1-dlenski@gmail.com> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="22419"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Daniel Lenski To: 44608@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Nov 13 01:49:10 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 1kdNH4-0005jC-N3 for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 13 Nov 2020 01:49:10 +0100 Original-Received: from localhost ([::1]:39780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdNH3-0004bz-OJ for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 12 Nov 2020 19:49:09 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:40508) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdNGw-0004br-FA for bug-gnu-emacs@gnu.org; Thu, 12 Nov 2020 19:49:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:34609) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kdNGw-00007Q-5d for bug-gnu-emacs@gnu.org; Thu, 12 Nov 2020 19:49:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kdNGw-00079N-4s for bug-gnu-emacs@gnu.org; Thu, 12 Nov 2020 19:49:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Daniel Lenski Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 13 Nov 2020 00:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 44608 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.160522852927465 (code B ref -1); Fri, 13 Nov 2020 00:49:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 13 Nov 2020 00:48:49 +0000 Original-Received: from localhost ([127.0.0.1]:46155 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kdNGj-00078v-9S for submit@debbugs.gnu.org; Thu, 12 Nov 2020 19:48:49 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:53142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kdNEJ-00075T-2D for submit@debbugs.gnu.org; Thu, 12 Nov 2020 19:46:19 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:40236) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdNEI-00035J-PY for bug-gnu-emacs@gnu.org; Thu, 12 Nov 2020 19:46:18 -0500 Original-Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]:43883) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kdNEH-0008PM-7I for bug-gnu-emacs@gnu.org; Thu, 12 Nov 2020 19:46:18 -0500 Original-Received: by mail-pf1-x441.google.com with SMTP id z3so6121958pfb.10 for ; Thu, 12 Nov 2020 16:46:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=0udIFlkQZQSSSRi06UXlAWt+sJDlXWDDpTqBYxNbS24=; b=UD6gxELgT1h3ey7AnnrZrTQUH62XQ1/luV8+Y6lfiLQyP8txTabGaFmAsUuYNP8Y6g s0ujYFiKbBt+GgNdcPveYTGrW+9gPgDGkY1Zy+wwQZDgCgjkp7zatUJpmaBkjdUURUJt ncRkcuGh+KyXmHJ/+eVxUoNtLSgd3MchGZHOdUApdkePcKIEtYXNS45XkhwPALwAGR1V xeAOzrwB2e5RX8yt1h6JL0dYokwHkF7w83nJHapHF0vWnRkx0PY5DzV6hP2GHicP34od 67yUdVSpqpwtcyEsPrMR6mUetUAGtC0FNmKVwZhRhTEqVXIkCz0z/WtqsilLZxhNilUw UNIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=0udIFlkQZQSSSRi06UXlAWt+sJDlXWDDpTqBYxNbS24=; b=sByq4HKTtban7aK5GpT7QE8BPxE9hQg6u03wyzIckOcmXyCuFi8re2BbL6irl/w/aI d6z9nQ7/Aq2FgBDxPtSaoFFf8WLoqu//VcqWfH/cq8ii+01Q/oRFdnqTOp1vYzfr6bZ9 FduNZslMQdAMCtM/j1oxRfXG9NyyJmNuYOnJcNvN2ObJEwzSGAldLetsKyk7MtQVJ//g ziPgvngtZXiAsTyCZS4QOAcplUck8vid7/aDB4V4SsjVy7upHLnuvNgN9o5KJZnWqwK0 ks6b8zBI2VdUlS+5NXvyBXBVktD6G/ZRznLYHLRVL1wjeoboz4t+N4P4X9k7dCK9v6sN Y1nQ== X-Gm-Message-State: AOAM531nb5PMtSWVAAThET4SRdEhA7BmwbHPfic9VSOrLQhbhqMW0VNl 7HQlhsP+q1mWzkk8ftIdCjKhH5CafhPupw== X-Google-Smtp-Source: ABdhPJx8dXF+EorJOcRs0etNTV1wpyVGC68QO9HEE2xlqyntH4JVzsEZ8Gp/Ztd4YWLU98M2wcck6Q== X-Received: by 2002:a63:5143:: with SMTP id r3mr1667014pgl.439.1605228375107; Thu, 12 Nov 2020 16:46:15 -0800 (PST) Original-Received: from u0b6eedb2c9435b.ant.amazon.com ([73.96.105.50]) by smtp.gmail.com with ESMTPSA id n68sm7662248pfn.161.2020.11.12.16.46.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 16:46:14 -0800 (PST) X-Mailer: git-send-email 2.17.1 Received-SPF: pass client-ip=2607:f8b0:4864:20::441; envelope-from=dlenski@gmail.com; helo=mail-pf1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Thu, 12 Nov 2020 19:48:48 -0500 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:193199 Archived-At: 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)) (displayme (if junk (concat "~/" (substring dd (match-end 0))) dd)) -- 2.17.1