diff options
| author | Stefan Monnier | 2023-04-02 17:45:58 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2023-04-02 17:45:58 -0400 |
| commit | 5223762e02ac84eee984cd1f7a17865766cdad9a (patch) | |
| tree | 379f3431cbf74fc73afc5fe89314bc98d1db762b /src/eval.c | |
| parent | 00144fa287eb168c1ba8e411e43fe13b9d2732ac (diff) | |
| download | emacs-5223762e02ac84eee984cd1f7a17865766cdad9a.tar.gz emacs-5223762e02ac84eee984cd1f7a17865766cdad9a.zip | |
src/eval.c: Fix bug#62419
Yup, almost 40 years after ELisp first combined them, buffer-local
and let bindings still don't work quite right :-(
The "automatically buffer-local if set" semantics should follow the
principle that it becomes buffer-local iff the var's current binding
refers to the top-level/global/non-let binding.
* src/eval.c (let_shadows_buffer_binding_p): Disregard non-global
let-bindings.
* test/src/eval-tests.el (eval-test--bug62419): New test.
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c index eb40c953f96..1a4d3ad0307 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -3400,7 +3400,7 @@ DEFUN ("fetch-bytecode", Ffetch_bytecode, Sfetch_bytecode, | |||
| 3400 | return object; | 3400 | return object; |
| 3401 | } | 3401 | } |
| 3402 | 3402 | ||
| 3403 | /* Return true if SYMBOL currently has a let-binding | 3403 | /* Return true if SYMBOL's default currently has a let-binding |
| 3404 | which was made in the buffer that is now current. */ | 3404 | which was made in the buffer that is now current. */ |
| 3405 | 3405 | ||
| 3406 | bool | 3406 | bool |
| @@ -3415,6 +3415,7 @@ let_shadows_buffer_binding_p (struct Lisp_Symbol *symbol) | |||
| 3415 | struct Lisp_Symbol *let_bound_symbol = XSYMBOL (specpdl_symbol (p)); | 3415 | struct Lisp_Symbol *let_bound_symbol = XSYMBOL (specpdl_symbol (p)); |
| 3416 | eassert (let_bound_symbol->u.s.redirect != SYMBOL_VARALIAS); | 3416 | eassert (let_bound_symbol->u.s.redirect != SYMBOL_VARALIAS); |
| 3417 | if (symbol == let_bound_symbol | 3417 | if (symbol == let_bound_symbol |
| 3418 | && p->kind != SPECPDL_LET_LOCAL /* bug#62419 */ | ||
| 3418 | && EQ (specpdl_where (p), buf)) | 3419 | && EQ (specpdl_where (p), buf)) |
| 3419 | return 1; | 3420 | return 1; |
| 3420 | } | 3421 | } |