From: Stefan Monnier via "Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>
To: "Gerd Möllmann" <gerd.moellmann@gmail.com>
Cc: 65209@debbugs.gnu.org
Subject: bug#65209: 30.0.50; Unexpected behaviour of setq-local
Date: Sun, 13 Aug 2023 15:51:04 -0400 [thread overview]
Message-ID: <jwvleeepvtu.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <jwvwmxyq4ik.fsf-monnier+emacs@gnu.org> (Stefan Monnier's message of "Sun, 13 Aug 2023 12:43:32 -0400")
> 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))
next prev parent reply other threads:[~2023-08-13 19:51 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-10 13:50 bug#65209: 30.0.50; Unexpected behaviour of setq-local Gerd Möllmann
2023-08-10 14:00 ` Eli Zaretskii
2023-08-11 0:17 ` Michael Heerdegen
2023-08-11 4:56 ` Gerd Möllmann
2023-08-11 5:53 ` Michael Heerdegen
2023-08-11 8:17 ` Gerd Möllmann
2023-08-11 11:09 ` Eli Zaretskii
2023-08-11 11:34 ` Gerd Möllmann
2023-08-11 11:36 ` Eli Zaretskii
2023-08-13 4:16 ` Michael Heerdegen
2023-08-13 5:53 ` Eli Zaretskii
2023-08-11 14:58 ` Drew Adams
2023-08-13 16:43 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-08-13 19:51 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors [this message]
2023-08-14 3:24 ` Michael Heerdegen
2023-08-14 4:05 ` Gerd Möllmann
2023-08-18 23:24 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-08-20 4:43 ` Michael Heerdegen
2023-08-20 6:49 ` Eli Zaretskii
2023-08-22 3:09 ` Michael Heerdegen
2023-08-22 10:56 ` Eli Zaretskii
2023-08-23 3:47 ` Michael Heerdegen
2023-08-23 11:39 ` Eli Zaretskii
2023-08-23 12:51 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-08-24 1:06 ` Michael Heerdegen
2023-08-24 5:22 ` Eli Zaretskii
2023-08-26 2:09 ` Michael Heerdegen
2023-08-26 6:02 ` Eli Zaretskii
2023-08-26 14:25 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-08-27 4:19 ` Michael Heerdegen
2023-08-24 3:31 ` Michael Heerdegen
2023-08-24 5:35 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvleeepvtu.fsf-monnier+emacs@gnu.org \
--to=bug-gnu-emacs@gnu.org \
--cc=65209@debbugs.gnu.org \
--cc=gerd.moellmann@gmail.com \
--cc=monnier@iro.umontreal.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).