From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#64311: [PATCH] Fix shell-dirtrack-mode showing up as enabled in unrelated buffers Date: Tue, 04 Jul 2023 19:05:02 +0300 Message-ID: <837crfll1t.fsf@gnu.org> References: <87pm5h4iy1.fsf@t510.orion.oneofus.la> <83h6qtw3tq.fsf@gnu.org> <87wmzp2e0d.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> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="20072"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 64311@debbugs.gnu.org, vas@oneofus.la To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Jul 04 18:06:21 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 1qGiXi-0004xZ-AK for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 04 Jul 2023 18:06:18 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qGiXV-0001Hc-9W; Tue, 04 Jul 2023 12:06:05 -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 1qGiXT-0001HM-Of for bug-gnu-emacs@gnu.org; Tue, 04 Jul 2023 12:06: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 1qGiXS-0002uQ-Lu for bug-gnu-emacs@gnu.org; Tue, 04 Jul 2023 12:06:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qGiXS-0007is-4T for bug-gnu-emacs@gnu.org; Tue, 04 Jul 2023 12:06:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 04 Jul 2023 16:06: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-submit@debbugs.gnu.org id=B64311.168848672029616 (code B ref 64311); Tue, 04 Jul 2023 16:06:02 +0000 Original-Received: (at 64311) by debbugs.gnu.org; 4 Jul 2023 16:05:20 +0000 Original-Received: from localhost ([127.0.0.1]:36467 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGiWm-0007hc-Fq for submit@debbugs.gnu.org; Tue, 04 Jul 2023 12:05:20 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:42038) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGiWi-0007hF-2w for 64311@debbugs.gnu.org; Tue, 04 Jul 2023 12:05:19 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qGiWc-0002jj-5U; Tue, 04 Jul 2023 12:05:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=QCvX5UzTh1W8IuMnQalcBPXhqiH9JcdIg5kf3u21c+4=; b=eqn2vRDc6TIz xZHc0wrgMyBXpkOOZjqS4AEQB11uTve1uZ+yLFb5holIrXyPs4T6y+T6Xy7J8pZ9bWXTpMN66yi+Y +XWxfBwb6pM/ZPL+ZtJdr5ajJXYKOQmXwz0xqCU4z+47HsLh3mGU/RzasozmJGzMOUuA81Qqbl0zp rNWEyS4kds8cYxbI7m0RYpR9U/nxDSnHuJoFFmflWtwplIk0cD98Ns23G7vaSSRo309ffH8IJpjnf kiWI9QGwYNhWYwkN055DgyrcdZ4T9gU9yAIK+YZQ3rUGBPR41zhGXKegcC1+PRTPcxKd2SlwThdJg kx/9wk/fQmpnBPulEOhiHQ==; Original-Received: from [87.69.77.57] (helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qGiWZ-0005pd-C2; Tue, 04 Jul 2023 12:05:09 -0400 In-Reply-To: (message from Stefan Monnier on Tue, 04 Jul 2023 10:28:55 -0400) 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:264592 Archived-At: > From: Stefan Monnier > Cc: Vladimir Sedach , 64311@debbugs.gnu.org > Date: Tue, 04 Jul 2023 10:28:55 -0400 > > FWIW, my take on the root cause is that I made a mistake in commit > 05327ca9724287cc3da4c625f180da5ab11be998 where I forgot to remove the > `defvar` of `shell-dirtrackp` (and I swapped the args to `defvaralias`). The problem here for me is that this mistake was made long ago, and by now there could be people out there who actually rely on this problematic alias. > > diff --git a/lisp/shell.el b/lisp/shell.el > > index 5cf108b..4bbd295 100644 > > --- a/lisp/shell.el > > +++ b/lisp/shell.el > > @@ -348,8 +348,10 @@ shell-dirstack > > > > (defvaralias 'shell-dirtrack-mode 'shell-dirtrackp) > > > > -(defvar shell-dirtrackp t > > - "Non-nil in a shell buffer means directory tracking is enabled.") > > +(defvar-local shell-dirtrackp nil > > + "Non-nil in a shell buffer means directory tracking is enabled. > > +Directory tracking (`shell-dirtrack-mode') is automatically enabled > > +when `shell-mode' is activated.") > > > > (defvar shell-last-dir nil > > "Keep track of last directory for ksh `cd -' command.") > > @@ -1129,6 +1131,7 @@ shell-extract-num > > > > (define-minor-mode shell-dirtrack-mode > > "Toggle directory tracking in this shell buffer (Shell Dirtrack mode). > > +This assigns a buffer-local non-nil value to `shell-dirtrackp'. > > > > The `dirtrack' package provides an alternative implementation of > > this feature; see the function `dirtrack-mode'. Also see > > This aligns the `defvar` of `shell-dirtrackp` with that of > `shell-dirtrack-mode`, which reduces the harm of the duplication, so > it fixes the worst part of my mess, thanks. > > I'd prefer the original patch, tho, which should give basically the same > end result but without this weird duplicate definition. The original patch makes a backward-incompatible change, which for me is a significant disadvantage. > I assume we're discussing this patch for `master`, not `emacs-29`, right? Yes.