From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#65209: 30.0.50; Unexpected behaviour of setq-local Date: Sun, 13 Aug 2023 15:51:04 -0400 Message-ID: References: <953357c8-83b4-5d7f-7638-e79382ad164c@gmail.com> Reply-To: Stefan Monnier Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="23496"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 65209@debbugs.gnu.org To: Gerd =?UTF-8?Q?M=C3=B6llmann?= Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Aug 13 21:52:19 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 1qVH8M-0005oa-15 for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 13 Aug 2023 21:52:18 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qVH89-0002pt-A4; Sun, 13 Aug 2023 15:52: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 1qVH86-0002pd-Tm for bug-gnu-emacs@gnu.org; Sun, 13 Aug 2023 15:52:03 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qVH86-0004Ug-Lq for bug-gnu-emacs@gnu.org; Sun, 13 Aug 2023 15:52:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qVH86-000314-AL for bug-gnu-emacs@gnu.org; Sun, 13 Aug 2023 15:52:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 13 Aug 2023 19:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65209 X-GNU-PR-Package: emacs Original-Received: via spool by 65209-submit@debbugs.gnu.org id=B65209.169195627511533 (code B ref 65209); Sun, 13 Aug 2023 19:52:02 +0000 Original-Received: (at 65209) by debbugs.gnu.org; 13 Aug 2023 19:51:15 +0000 Original-Received: from localhost ([127.0.0.1]:60352 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qVH7K-0002zw-Ft for submit@debbugs.gnu.org; Sun, 13 Aug 2023 15:51:14 -0400 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:41037) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qVH7I-0002zk-MA for 65209@debbugs.gnu.org; Sun, 13 Aug 2023 15:51:13 -0400 Original-Received: from pmg3.iro.umontreal.ca (localhost [127.0.0.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id 4E6B4442637; Sun, 13 Aug 2023 15:51:07 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1691956265; bh=FmnlbIdtvGExzz26deovyO6ac4FJfn0VtsaLIabMZOE=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=Kl8B3mb43Xnykjhwls3LplFgmGdLdFWZjRHaBG6suZGRKS2+qkBdb08p4OhFcXcvM wDAJJJeQIB/UxCsGtw/IsoqQdrCnrpDrp96hun6ILq/RBJh2Pbnc+6z+QhGSPnnfVD QQRG46QeSPFWWmQVQK0CUtwyTVaGjo5gxeS6GPX4VZB+nwnSEQ1hSPsLFkcu/9PgBP kzIHQeEgDB8y1DKNgiJ6rMmGAAcV3PJ1CwNxy7jrCR0AEgooDSODWvzZsDnPykmnOa 2V/lSOSO9v7i+PW49urOxWkxDCepFsgmU4RplRFYegmF92tGV5p+nirqpDTuQZ/Huu koeNntWPr8KeA== Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id 65319442649; Sun, 13 Aug 2023 15:51:05 -0400 (EDT) Original-Received: from pastel (unknown [45.72.228.154]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 439C8120377; Sun, 13 Aug 2023 15:51:05 -0400 (EDT) In-Reply-To: (Stefan Monnier's message of "Sun, 13 Aug 2023 12:43:32 -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:267383 Archived-At: > Hmm... this is a bug in `make-local-variable` where we do: > > if (blv ? blv->local_if_set > : (forwarded && BUFFER_OBJFWDP (valcontents.fwd))) > { > tem = Fboundp (variable); > /* Make sure the symbol has a local value in this particular buffer, > by setting it to the same value it already has. */ > Fset (variable, (EQ (tem, Qt) ? Fsymbol_value (variable) : Qunbound)); > return variable; > } > > I.e. we assume that if a var is `make-variable-buffer-local` then `set` > will make sure it has a buffer-local value, but this is not true if the > var is currently let-bound. The patch below seems to work (for some reason, I'm getting several errors in `make check` today, but they seems unaffected by this patch (i.e. I get the same errors in a vanilla build)). Stefan diff --git a/src/data.c b/src/data.c index 619ab8fde64..6dc3a686aa8 100644 --- a/src/data.c +++ b/src/data.c @@ -2213,8 +2213,7 @@ DEFUN ("make-local-variable", Fmake_local_variable, Smake_local_variable, if (sym->u.s.trapped_write == SYMBOL_NOWRITE) xsignal1 (Qsetting_constant, variable); - if (blv ? blv->local_if_set - : (forwarded && BUFFER_OBJFWDP (valcontents.fwd))) + if (!blv && (forwarded && BUFFER_OBJFWDP (valcontents.fwd))) { tem = Fboundp (variable); /* Make sure the symbol has a local value in this particular buffer, diff --git a/test/src/data-tests.el b/test/src/data-tests.el index 680fdd57d71..d93bfec3015 100644 --- a/test/src/data-tests.el +++ b/test/src/data-tests.el @@ -768,6 +768,24 @@ data-tests-make-local-forwarded-var (default-value 'last-coding-system-used)) '(no-conversion bug34318))))) +(defvar-local data-tests--bug65209 :default-value) + +(ert-deftest data-tests-make-local-bug65209 () + (let (vli vlo vgi vgo) + (with-temp-buffer + (let ((data-tests--bug65209 :let-bound-value)) + ;; While `setq' would not make the var buffer-local + ;; (because we'd be setq-ing the let-binding instead), + ;; `setq-local' definitely should. + (setq-local data-tests--bug65209 :buffer-local-value) + (setq vgi (with-temp-buffer data-tests--bug65209)) + (setq vli data-tests--bug65209)) + (setq vgo (with-temp-buffer data-tests--bug65209)) + (setq vlo data-tests--bug65209)) + (should (equal (list vli vlo vgi vgo) + '(:buffer-local-value :buffer-local-value + :let-bound-value :default-value))))) + (ert-deftest data-tests-make_symbol_constant () "Can't set variable marked with 'make_symbol_constant'." (should-error (setq most-positive-fixnum 1) :type 'setting-constant))