From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Vladimir Sedach Newsgroups: gmane.emacs.bugs Subject: bug#64311: [PATCH] Fix shell-dirtrack-mode showing up as enabled in unrelated buffers Date: Sat, 08 Jul 2023 10:18:40 -0600 Message-ID: <871qhitlzz.fsf@t510.orion.oneofus.la> References: <87pm5h4iy1.fsf@t510.orion.oneofus.la> <831qhwx5qf.fsf@gnu.org> <87zg4k76es.fsf@orphne.orion.oneofus.la> <83mt0jvmfu.fsf@gnu.org> <87r0pva66g.fsf@t510.orion.oneofus.la> <834jmrv3p6.fsf@gnu.org> <87o7kz9wej.fsf@t510.orion.oneofus.la> <83wmzmuaq7.fsf@gnu.org> <87wmzmb5fl.fsf@t510.orion.oneofus.la> <83a5wita0p.fsf@gnu.org> <87ttuqax6d.fsf@t510.orion.oneofus.la> <835y75tsn7.fsf@gnu.org> <87r0ps7v92.fsf@t510.orion.oneofus.la> <831qhqq0kf.fsf@gnu.org> <837crfll1t.fsf@gnu.org> <87h6qjfh2y.fsf@t510.orion.oneofus.la> <878rbspyuf.fsf@t510.orion.oneofus.la> <83r0pidcv2.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="4076"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: mu4e 1.4.15; emacs 28.2 Cc: 64311-done@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Jul 08 18:19:14 2023 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 1qIAeQ-0000q2-0h for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 08 Jul 2023 18:19:14 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qIAeG-0007F0-SH; Sat, 08 Jul 2023 12:19:04 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qIAeF-0007Es-3v for bug-gnu-emacs@gnu.org; Sat, 08 Jul 2023 12:19:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qIAeE-0002KP-S4 for bug-gnu-emacs@gnu.org; Sat, 08 Jul 2023 12:19:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qIAeE-0004kG-55 for bug-gnu-emacs@gnu.org; Sat, 08 Jul 2023 12:19:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Vladimir Sedach Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 08 Jul 2023 16:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64311 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 64311-done@debbugs.gnu.org id=D64311.168883312718210 (code D ref 64311); Sat, 08 Jul 2023 16:19:02 +0000 Original-Received: (at 64311-done) by debbugs.gnu.org; 8 Jul 2023 16:18:47 +0000 Original-Received: from localhost ([127.0.0.1]:45094 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qIAdz-0004je-3O for submit@debbugs.gnu.org; Sat, 08 Jul 2023 12:18:47 -0400 Original-Received: from robust-software.ca ([174.136.98.50]:42330) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qIAdw-0004jP-02 for 64311-done@debbugs.gnu.org; Sat, 08 Jul 2023 12:18:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=virgo1; bh=S/3UmTAP1kOBW Dmmo87Ud4C+RtDsD07aIEUrfYW7tKc=; h=date:in-reply-to:subject:cc:to: from:references; d=oneofus.la; b=XIBvBfk3909GM3+SZ5oA34N7HGU+xYj/YVx46 hjPbna0og5BgzI84Qm0Reo8GW/w7nYQWH4+Jj14iEfGal7fCLleLjNYFpKbbAaNY0aMswU M5BHp0mHoKZmy4FoGaZuvaX+2keEobgZ9WI4pBQZkabHAMhv8q72vOUu6QkHEhUo= Original-Received: from t510.orion.oneofus.la (node-1w7jra28qzk6x26tggabny44d.ipv6.telus.net [2001:56a:f913:3c01:416e:73e7:ae69:6c5d]) by virgo1.oneofus.la (OpenSMTPD) with ESMTPSA id be1d70a4 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 8 Jul 2023 09:18:42 -0700 (PDT) In-reply-to: <83r0pidcv2.fsf@gnu.org> 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-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:264777 Archived-At: --=-=-= Content-Type: text/plain Eli Zaretskii writes: > Thanks, I installed this, with slight changes, on the master branch, > and I'm therefore closing this bug. Thank you. There is also the unit tests patch in the original email (attached here as well) that should be applied. -- Vladimir Sedach --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-test-lisp-shell-tests.el-added-tests-for-shell-dirtr.patch >From ce4b041bd71cd7ee1b025cc14ae962f8d98d9478 Mon Sep 17 00:00:00 2001 From: Vladimir Sedach Date: Mon, 26 Jun 2023 22:30:25 -0600 Subject: [PATCH 1/2] ; * test/lisp/shell-tests.el: added tests for shell-dirtrack-mode --- test/lisp/shell-tests.el | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/test/lisp/shell-tests.el b/test/lisp/shell-tests.el index db9124e2435..ddddfdb2e0f 100644 --- a/test/lisp/shell-tests.el +++ b/test/lisp/shell-tests.el @@ -64,4 +64,35 @@ shell-tests-split-string (should (equal (split-string-shell-command "ls /tmp/foo\\ bar") '("ls" "/tmp/foo bar"))))) +(ert-deftest shell-dirtrack-on-by-default () + (with-temp-buffer + (shell-mode) + (should shell-dirtrack-mode))) + +(ert-deftest shell-dirtrack-should-not-be-on-in-unrelated-modes () + (with-temp-buffer + (should (not shell-dirtrack-mode)))) + +(ert-deftest shell-dirtrack-sets-list-buffers-directory () + (let ((start-dir default-directory)) + (with-temp-buffer + (should-not list-buffers-directory) + (shell-mode) + (shell-cd "..") + (should list-buffers-directory) + (should (not (equal start-dir list-buffers-directory))) + (should (string-prefix-p list-buffers-directory start-dir))))) + +(ert-deftest shell-directory-tracker-cd () + (let ((start-dir default-directory)) + (with-temp-buffer + (should-not list-buffers-directory) + (shell-mode) + (cl-letf (((symbol-function 'shell-unquote-argument) + (lambda (x) x))) + (shell-directory-tracker "cd ..")) + (should list-buffers-directory) + (should (not (equal start-dir list-buffers-directory))) + (should (string-prefix-p list-buffers-directory start-dir))))) + ;;; shell-tests.el ends here -- 2.20.1 --=-=-=--