From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Phil Sainty Newsgroups: gmane.emacs.bugs Subject: bug#31355: 26.1; [PATCH] Fix remote-host/tramp directory tracking for shells in `term' buffers Date: Fri, 04 May 2018 02:47:40 +1200 Message-ID: References: <3d76a935822f56f94705b1f59421a00a@webmail.orcon.net.nz> <8736z8u96d.fsf@gmx.de> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=_e73feeb86a9946d95deabf23c036a836" X-Trace: blaine.gmane.org 1525358770 25538 195.159.176.226 (3 May 2018 14:46:10 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 3 May 2018 14:46:10 +0000 (UTC) User-Agent: Orcon Webmail Cc: bug-gnu-emacs , 31355@debbugs.gnu.org To: Michael Albinus Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu May 03 16:46:05 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 1fEFUh-0006Tu-Kg for geb-bug-gnu-emacs@m.gmane.org; Thu, 03 May 2018 16:46:03 +0200 Original-Received: from localhost ([::1]:57035 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEFWo-00077q-Qh for geb-bug-gnu-emacs@m.gmane.org; Thu, 03 May 2018 10:48:14 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56135) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEFWg-00077W-Ib for bug-gnu-emacs@gnu.org; Thu, 03 May 2018 10:48:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fEFWc-0006oO-Ge for bug-gnu-emacs@gnu.org; Thu, 03 May 2018 10:48:06 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:40453) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fEFWc-0006oB-CH for bug-gnu-emacs@gnu.org; Thu, 03 May 2018 10:48:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fEFWc-0002Gq-0F for bug-gnu-emacs@gnu.org; Thu, 03 May 2018 10:48:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Phil Sainty Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 03 May 2018 14:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31355 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 31355-submit@debbugs.gnu.org id=B31355.15253588748715 (code B ref 31355); Thu, 03 May 2018 14:48:01 +0000 Original-Received: (at 31355) by debbugs.gnu.org; 3 May 2018 14:47:54 +0000 Original-Received: from localhost ([127.0.0.1]:48350 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fEFWU-0002GV-2N for submit@debbugs.gnu.org; Thu, 03 May 2018 10:47:54 -0400 Original-Received: from smtp-3.orcon.net.nz ([60.234.4.44]:43503) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fEFWS-0002GM-GC for 31355@debbugs.gnu.org; Thu, 03 May 2018 10:47:53 -0400 Original-Received: from [10.253.37.70] (port=39889 helo=webmail.orcon.net.nz) by smtp-3.orcon.net.nz with esmtpa (Exim 4.86_2) (envelope-from ) id 1fEFWG-0005PK-Mv; Fri, 04 May 2018 02:47:49 +1200 Original-Received: from [150.107.175.243] via [10.253.37.253] by webmail.orcon.net.nz with HTTP (HTTP/1.1 POST); Fri, 04 May 2018 02:47:40 +1200 In-Reply-To: <8736z8u96d.fsf@gmx.de> X-Sender: psainty@orcon.net.nz X-GeoIP: -- X-Spam_score: -2.9 X-Spam_score_int: -28 X-Spam_bar: -- 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:145973 Archived-At: --=_e73feeb86a9946d95deabf23c036a836 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed On 2018-05-04 02:04, Michael Albinus wrote: > Furthermore, I wouldn't hard-code "ssh". People might have other > preferences, and on some systems it doesn't work. Think about Emacs > running on MS WIndows, where "plink" is used instead of "ssh". Just > take > "-" as method, this is a notation to apply user's default (Tramp) > method. Revised patch attached to use the "-" pseudo method. > I believe it is always save to use term-ansi-at-user. There's no need > to check, whether it is equal to (user-real-login-name). I've not changed this. The code is evidentially deciding whether the user/host pair being tracked in the shell in the term buffer is a match for the user/host pair known locally to Emacs. Unless both of those components match, a tramp path is created. I've not tested the case of a different user on the local host, but it seems like reasonable logic to me, at first look. (if (and (string= term-ansi-at-host (system-name)) (string= term-ansi-at-user (user-real-login-name))) ;; Use a local path ;; Use a tramp path --=_e73feeb86a9946d95deabf23c036a836 Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name=0001-Fix-remote-host-directory-tracking-for-shells-in-ter.patch Content-Disposition: attachment; filename=0001-Fix-remote-host-directory-tracking-for-shells-in-ter.patch; size=2930 RnJvbSA0YzM2MjBkM2E0MjBiM2VkNjE3ZTk1ZDEyN2NlNWU1MzMzY2VkYTYxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsIFNhaW50eSA8cHNhaW50eUBvcmNvbi5uZXQubno+CkRh dGU6IEZyaSwgNCBNYXkgMjAxOCAwMToyOTo0MiArMTIwMApTdWJqZWN0OiBbUEFUQ0hdIEZpeCBy ZW1vdGUtaG9zdCBkaXJlY3RvcnkgdHJhY2tpbmcgZm9yIHNoZWxscyBpbiBgdGVybScKIGJ1ZmZl cnMKCiogbGlzcC90ZXJtLmVsICh0ZXJtLWhhbmRsZS1hbnNpLXRlcm1pbmFsLW1lc3NhZ2VzKTog VXNlIGFuIGV4cGxpY2l0CnRyYW1wIG1ldGhvZCB3aGVuIGNvbnN0cnVjdGluZyB0aGUgdHJhbXAg cGF0aCBmb3IgYSBub24tbG9jYWwgaG9zdCwKYXMgdGhpcyBpcyBub3cgbWFuZGF0b3J5LiAgIi0i IGlzIGEgcHNldWRvLW1ldGhvZCBmb3IgdGhlIHVzZXIncwpgdHJhbXAtZGVmYXVsdC1tZXRob2Qn LgoKTWlub3IgcmVsYXRlZCBpbXByb3ZlbWVudHMgdG8gdGhlIGNvbW1lbnRhcnkuCi0tLQogbGlz cC90ZXJtLmVsIHwgMjcgKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdl ZCwgMTUgaW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGlzcC90 ZXJtLmVsIGIvbGlzcC90ZXJtLmVsCmluZGV4IDc1YzI3NzkuLjJmYmM3OTYgMTAwNjQ0Ci0tLSBh L2xpc3AvdGVybS5lbAorKysgYi9saXNwL3Rlcm0uZWwKQEAgLTIzMywzMSArMjMzLDMzIEBACiA7 OwogOzsgIE5vdGljZTogZm9yIGRpcmVjdG9yeS9ob3N0L3VzZXIgdHJhY2tpbmcgeW91IG5lZWQg dG8gaGF2ZSBzb21ldGhpbmcKIDs7IGxpa2UgdGhpcyBpbiB5b3VyIHNoZWxsIHN0YXJ0dXAgc2Ny aXB0ICh0aGlzIGlzIGZvciBhIFBPU0lYaXNoIHNoZWxsCi07OyBsaWtlIEJhc2ggYnV0IHNob3Vs ZCBiZSBxdWl0ZSBlYXN5IHRvIHBvcnQgdG8gb3RoZXIgc2hlbGxzKQorOzsgbGlrZSBCYXNoIGJ1 dCBzaG91bGQgYmUgcXVpdGUgZWFzeSB0byBwb3J0IHRvIG90aGVyIHNoZWxscykuCis7OworOzsg Rm9yIHRyb3VibGVzaG9vdGluZyBpbiBCYXNoLCB5b3UgY2FuIGNoZWNrIHRoZSBkZWZpbml0aW9u IG9mIHRoZQorOzsgY3VzdG9tIGZ1bmN0aW9ucyB3aXRoIHRoZSAidHlwZSIgY29tbWFuZC4gIGUu Zy4gInR5cGUgY2QiLiAgSWYgeW91Cis7OyBkbyBub3Qgc2VlIHRoZSBleHBlY3RlZCBkZWZpbml0 aW9uIGZyb20gdGhlIGNvbmZpZyBiZWxvdywgdGhlbiB0aGUKKzs7IGRpcmVjdG9yeSB0cmFja2lu ZyB3aWxsIG5vdCB3b3JrLgogOzsKIDs7ICAgICAgICAgICAgIC0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0KIDs7Ci07OyAgIyBTZXQgSE9TVE5BTUUgaWYgbm90IGFscmVh ZHkgc2V0LgorOzsJIyBTZXQgSE9TVE5BTUUgaWYgbm90IGFscmVhZHkgc2V0LgogOzsJOiAke0hP U1ROQU1FPSQodW5hbWUgLW4pfQogOzsKLTs7ICAjIHN1IGRvZXMgbm90IGNoYW5nZSB0aGlzIGJ1 dCBJJ2QgbGlrZSBpdCB0bwotOzsKKzs7CSMgc3UgZG9lcyBub3QgY2hhbmdlIHRoaXMgYnV0IEkn ZCBsaWtlIGl0IHRvCiA7OwlVU0VSPSQod2hvYW1pKQogOzsKLTs7ICAjIC4uLgorOzsJIyAuLi4K IDs7CiA7OwljYXNlICRURVJNIGluCiA7OwkgICAgZXRlcm0qKQogOzsKIDs7CQlwcmludGYgJyVz XG4nIFwKIDs7CQkgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0gXAotOzsJCSAiSGVsbG8gJHVzZXIiIFwKKzs7CQkgIkhlbGxvICRV U0VSIiBcCiA7OwkJICJUb2RheSBpcyAkKGRhdGUpIiBcCiA7OwkJICJXZSBhcmUgb24gJEhPU1RO QU1FIHJ1bm5pbmcgJCh1bmFtZSkgdW5kZXIgRW1hY3MgdGVybSBtb2RlIiBcCiA7OwkJIC0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t CiA7OwotOzsJCWV4cG9ydCBFRElUT1I9ZW1hY3NjbGllbnQKLTs7CiA7OwkJIyBUaGUgXDAzMyBz dGFuZHMgZm9yIEVTQy4KIDs7CQkjIFRoZXJlIGlzIGEgc3BhY2UgYmV0d2VlbiAiQW5TaVQ/IiBh bmQgJHdoYXRldmVyLgogOzsKQEAgLTI2OSwxMCArMjcxLDExIEBACiA7OwkJcHJpbnRmICdcMDMz QW5TaVRoICVzXG4nICIkSE9TVE5BTUUiCiA7OwkJcHJpbnRmICdcMDMzQW5TaVR1ICVzXG4nICIk VVNFUiIKIDs7Ci07OwkJZXZhbCAkKGRpcmNvbG9ycyAkSE9NRS8uZW1hY3NfZGlyY29sb3JzKQor OzsJCSMgVXNlIGN1c3RvbSBkaXJjb2xvcnMgaW4gdGVybSBidWZmZXJzLgorOzsJCSMgZXZhbCAk KGRpcmNvbG9ycyAkSE9NRS8uZW1hY3NfZGlyY29sb3JzKQogOzsJZXNhYwogOzsKLTs7ICAjIC4u LgorOzsJIyAuLi4KIDs7CiA7OwogCkBAIC0yNzUzLDggKzI3NTYsOCBAQCB0ZXJtLWhhbmRsZS1h bnNpLXRlcm1pbmFsLW1lc3NhZ2VzCiAJCQkJCShzdHJpbmc9IHRlcm0tYW5zaS1hdC11c2VyICh1 c2VyLXJlYWwtbG9naW4tbmFtZSkpKQogCQkgICAoZXhwYW5kLWZpbGUtbmFtZSB0ZXJtLWFuc2kt YXQtZGlyKQogCQkgKGlmIChzdHJpbmc9IHRlcm0tYW5zaS1hdC11c2VyICh1c2VyLXJlYWwtbG9n aW4tbmFtZSkpCi0JCSAgICAgKGNvbmNhdCAiLyIgdGVybS1hbnNpLWF0LWhvc3QgIjoiIHRlcm0t YW5zaS1hdC1kaXIpCi0JCSAgIChjb25jYXQgIi8iIHRlcm0tYW5zaS1hdC11c2VyICJAIiB0ZXJt LWFuc2ktYXQtaG9zdCAiOiIKKyAgICAgICAgICAgICAgICAgICAgIChjb25jYXQgIi8tOiIgdGVy bS1hbnNpLWF0LWhvc3QgIjoiIHRlcm0tYW5zaS1hdC1kaXIpCisgICAgICAgICAgICAgICAgICAg KGNvbmNhdCAiLy06IiB0ZXJtLWFuc2ktYXQtdXNlciAiQCIgdGVybS1hbnNpLWF0LWhvc3QgIjoi CiAJCQkgICB0ZXJtLWFuc2ktYXQtZGlyKSkpKSkKIAogCTs7IEknbSBub3Qgc3VyZSB0aGlzIGlz IG5lY2Vzc2FyeSwKLS0gCjIuOC4zCgo= --=_e73feeb86a9946d95deabf23c036a836--