From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Michael Albinus Newsgroups: gmane.emacs.bugs Subject: bug#32304: 27.0.50; tramp-tests issue with double slash Date: Mon, 30 Jul 2018 12:43:46 +0200 Message-ID: <874lghdmvx.fsf@gmx.de> References: <87pnz6dn2b.fsf@gmx.de> <63b21ac4-2f44-9e1a-bf0a-3242e6a1b9ed@cornell.edu> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1532947335 31346 195.159.176.226 (30 Jul 2018 10:42:15 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 30 Jul 2018 10:42:15 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: 32304@debbugs.gnu.org To: Ken Brown Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Jul 30 12:42:11 2018 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fk5cw-0007zE-A4 for geb-bug-gnu-emacs@m.gmane.org; Mon, 30 Jul 2018 12:42:11 +0200 Original-Received: from localhost ([::1]:51782 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fk5f1-00085d-Bn for geb-bug-gnu-emacs@m.gmane.org; Mon, 30 Jul 2018 06:44:19 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35390) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fk5en-00085W-L9 for bug-gnu-emacs@gnu.org; Mon, 30 Jul 2018 06:44:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fk5ek-0008Dk-Ge for bug-gnu-emacs@gnu.org; Mon, 30 Jul 2018 06:44:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:57636) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fk5ek-0008Db-AU for bug-gnu-emacs@gnu.org; Mon, 30 Jul 2018 06:44:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fk5ej-0003pf-UI for bug-gnu-emacs@gnu.org; Mon, 30 Jul 2018 06:44:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Michael Albinus Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 30 Jul 2018 10:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 32304 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 32304-submit@debbugs.gnu.org id=B32304.153294744014717 (code B ref 32304); Mon, 30 Jul 2018 10:44:01 +0000 Original-Received: (at 32304) by debbugs.gnu.org; 30 Jul 2018 10:44:00 +0000 Original-Received: from localhost ([127.0.0.1]:34421 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fk5ei-0003pI-HL for submit@debbugs.gnu.org; Mon, 30 Jul 2018 06:44:00 -0400 Original-Received: from mout.gmx.net ([212.227.15.19]:39455) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fk5eg-0003p0-0b for 32304@debbugs.gnu.org; Mon, 30 Jul 2018 06:43:58 -0400 Original-Received: from detlef.gmx.de ([79.140.118.129]) by mail.gmx.com (mrgmx001 [212.227.17.190]) with ESMTPSA (Nemesis) id 0MPlY2-1ff9hx1wwc-00557X; Mon, 30 Jul 2018 12:43:47 +0200 In-Reply-To: <63b21ac4-2f44-9e1a-bf0a-3242e6a1b9ed@cornell.edu> (Ken Brown's message of "Sun, 29 Jul 2018 12:47:43 -0400") X-Provags-ID: V03:K1:nOWgzO092miKNfEhRnG6A4nlQNhpsZ2Ruo3sKbYZ7Be6Cb8OwWb 0IWtlp58tBPOgnJVR/qXSJh85nmWYkPnyWsOtz89jrAYs/q29te+BRMZBh8dNbi8vWhpLQG F+5LE0Aa+CBm+gHyp5QjT9nJgsWhbmW87OFXfTFd9LavNDW8GwZ3STf2RveKzir9oe9WAQV CrS7ddajdJ+vu7onE5BzA== X-UI-Out-Filterresults: notjunk:1;V01:K0:dZVRjLdjBgA=:TvoyZ3wL9zmD/HuO5CfaSH atSuP3l4IC+JjQjsyzsL1q5JZlPSxIWH7DBPKlk1Sio53ER5uIh5leuwUhrGZfFfO0vPWmvRG awMnQ5LJ3qUmAzHbcO0wSAhl/0jlLBkmW32F0HWGogTZ/1DIt+M8eDgUufyzzG4LSnWcL9IzN 4jka1XnvSHgDi+7Fazf+KjekarzJdiLSO3L7pXV/wspf2UnLJPmYfzl/m6p27CF4HZhwz18pV +YPiB3tLWpayTNR8rRWtDMCAqZocBDupKd1R4xBj6KedT7So7w4oTryTmy/4cptkz4xg+i3XT eGeLRvNcM0iVERdIdDsMVqFUzujfhqY5UXfZV/WZNLhZCVSNwB5ql4auqUTnmc9mdTbkgLcf4 E4/XGdXUMxJ5ZBDjIDZxijLcMZqdciQ/DxJMA2oeaJIn5umoKqqTFQfbs3eGpSTPtrOf0Xhaf R1eAsoPmWp/bWsSk28bOucdK7PvX9T/iHxVpSEHfbsJmSxQFrsdP91EoJicqxFm76v7rktwDQ ALL8toi94vH+oMvn6G+psnvCqT8wudoCDC6+Ybrj5ku13bLY+StELVt5a0mWm8Vt1LLyEsywY TolQcGcbko4deIU3v+Oi7mehurTzLKvxiH8DDASIsOkbx3qOmUNr5vLKK2+bpt6yue5BQbgAY Oz3tk3eZe5CSSYjo/eHM4c2H3ju26sS7HuumnMj1XJfC6wXKKEwmXnPdUh4DACZZksxxGDNYU Nhl/2nmylvI/3E8DcZrXypu07g9nW19C84tViuPdgNOXIcKprpwein2B78A= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 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.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:149071 Archived-At: --=-=-= Content-Type: text/plain Ken Brown writes: > Hi Michael, Hi Ken, > I think something further must be needed. The test still fails in the > same way. There's another patch, could you pls check? > Best regards, > > Ken Best regards, Michael. --=-=-= Content-Type: text/plain Content-Disposition: attachment diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index d56b09a604..1af2defd58 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -3567,16 +3567,20 @@ tramp-handle-substitute-in-file-name ;; First, we must replace environment variables. (setq filename (tramp-replace-environment-variables filename)) (with-parsed-tramp-file-name filename nil - ;; We do not want to replace environment variables, again. + ;; We do not want to replace environment variables, again. "//" + ;; has a special meaning at the beginning of a file name on + ;; Cygwin and MS-Windows, we must remove it. (let (process-environment) ;; Ignore in LOCALNAME everything before "//" or "/~". (when (stringp localname) (if (string-match "//\\(/\\|~\\)" localname) - (setq filename (substitute-in-file-name localname)) + (setq filename + (replace-regexp-in-string + "\\`/+" "/" (substitute-in-file-name localname))) (setq filename (concat (file-remote-p filename) - (tramp-run-real-handler - 'substitute-in-file-name (list localname))))))) + (replace-regexp-in-string + "\\`/+" "/" (substitute-in-file-name localname))))))) ;; "/m:h:~" does not work for completion. We use "/m:h:~/". (if (and (stringp localname) (string-equal "~" localname)) (concat filename "/") --=-=-=--