From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#63648: 29.0.90; project.el: with switch-use-entire-map, switch-project errors on non-project commands Date: Thu, 01 Jun 2023 19:05:07 +0300 Organization: LINKOV.NET Message-ID: <86cz2f7bvo.fsf@mail.linkov.net> References: <86wn10e1wl.fsf@mail.linkov.net> <482a1ebc-165c-a0a4-98c0-5c404d1b1d0d@gutov.dev> <86jzwyxnxb.fsf@mail.linkov.net> <86o7m91z22.fsf@mail.linkov.net> <86pm6py6k4.fsf@mail.linkov.net> <86bki9y68h.fsf@mail.linkov.net> 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="2612"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) Cc: Spencer Baugh , 63648@debbugs.gnu.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Jun 01 18:10:39 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 1q4ksp-0000Yf-BU for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 01 Jun 2023 18:10:39 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4ksR-0005oP-Qc; Thu, 01 Jun 2023 12:10:16 -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 1q4ksG-0005lC-MW for bug-gnu-emacs@gnu.org; Thu, 01 Jun 2023 12:10:06 -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 1q4ksE-0003BW-PG for bug-gnu-emacs@gnu.org; Thu, 01 Jun 2023 12:10:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q4ksE-00019L-Go for bug-gnu-emacs@gnu.org; Thu, 01 Jun 2023 12:10:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 01 Jun 2023 16:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63648 X-GNU-PR-Package: emacs Original-Received: via spool by 63648-submit@debbugs.gnu.org id=B63648.16856357934382 (code B ref 63648); Thu, 01 Jun 2023 16:10:02 +0000 Original-Received: (at 63648) by debbugs.gnu.org; 1 Jun 2023 16:09:53 +0000 Original-Received: from localhost ([127.0.0.1]:38374 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q4ks5-00018b-8C for submit@debbugs.gnu.org; Thu, 01 Jun 2023 12:09:53 -0400 Original-Received: from relay5-d.mail.gandi.net ([217.70.183.197]:49633) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q4ks3-00018I-1U for 63648@debbugs.gnu.org; Thu, 01 Jun 2023 12:09:52 -0400 X-GND-Sasl: juri@linkov.net X-GND-Sasl: juri@linkov.net X-GND-Sasl: juri@linkov.net Original-Received: by mail.gandi.net (Postfix) with ESMTPSA id 4A5671C0005; Thu, 1 Jun 2023 16:09:42 +0000 (UTC) In-Reply-To: <86bki9y68h.fsf@mail.linkov.net> (Juri Linkov's message of "Wed, 24 May 2023 20:44:14 +0300") 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:262707 Archived-At: --=-=-= Content-Type: text/plain >> 1. the current buffer should remain the same for the next command; >> 2. the buffer-local value of 'default-directory' should remain the same; >> 3. the next command should have a new value of 'default-directory'. >> >> I see no way to satisfy all these requirements. > > Except adding a variable like 'project-current-directory-override' > somewhere inside 'command_loop_1'. And indeed with the following patch replacing the current definition of 'project-switch-project' with just: (defun project-switch-project (dir) (interactive (list (funcall project-prompter))) (setq next-default-directory dir)) 'C-x p p (select project ...) RET M-& pwd RET' confirms that the command runs in the selected project directory. Whereas the original buffer keeps its previous buffer-local value of 'default-directory'. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=next-default-directory.patch diff --git a/src/buffer.c b/src/buffer.c index 0c46b201586..ca81db21894 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -5360,6 +5360,10 @@ syms_of_buffer (void) these names start with `/' or `~' and end with `/'. To interactively change the default directory, use command `cd'. */); + DEFVAR_LISP ("next-default-directory", Vnext_default_directory, + doc: /* Default directory for the next command. */); + Vnext_default_directory = Qnil; + DEFVAR_PER_BUFFER ("auto-fill-function", &BVAR (current_buffer, auto_fill_function), Qnil, doc: /* Function called (if non-nil) to perform auto-fill. diff --git a/src/keyboard.c b/src/keyboard.c index 14c55666768..dfe939750c9 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -1500,7 +1500,19 @@ command_loop_1 (void) update_redisplay_ticks (0, NULL); display_working_on_window_p = false; + Lisp_Object next_dir = Vnext_default_directory; + specpdl_ref count = SPECPDL_INDEX (); + if (!NILP (next_dir)) + specbind (Qdefault_directory, next_dir); + call1 (Qcommand_execute, Vthis_command); + + if (!NILP (next_dir)) + { + unbind_to (count, Qnil); + Vnext_default_directory = Qnil; + } + display_working_on_window_p = false; #ifdef HAVE_WINDOW_SYSTEM --=-=-=--