gv.el and cl-macs.el: Fix bug#57397
* lisp/emacs-lisp/gv.el (gv-get): Obey symbol macros. * lisp/emacs-lisp/cl-macs.el (cl--letf): Remove workaround placed to try and handle symbol macros. * test/lisp/emacs-lisp/cl-macs-tests.el (cl-macs-test--symbol-macrolet): Add new testcase.
This commit is contained in:
parent
1d1158397b
commit
2dd1c2ab19
3 changed files with 20 additions and 3 deletions
|
@ -2762,7 +2762,7 @@ Each PLACE may be a symbol, or any generalized variable allowed by `setf'.
|
|||
(funcall setter vold)))
|
||||
binds))))
|
||||
(let* ((binding (car bindings))
|
||||
(place (macroexpand (car binding) macroexpand-all-environment)))
|
||||
(place (car binding)))
|
||||
(gv-letplace (getter setter) place
|
||||
(macroexp-let2 nil vnew (cadr binding)
|
||||
(if (symbolp place)
|
||||
|
|
|
@ -87,7 +87,11 @@ with a (not necessarily copyable) Elisp expression that returns the value to
|
|||
set it to.
|
||||
DO must return an Elisp expression."
|
||||
(cond
|
||||
((symbolp place) (funcall do place (lambda (v) `(setq ,place ,v))))
|
||||
((symbolp place)
|
||||
(let ((me (macroexpand-1 place macroexpand-all-environment)))
|
||||
(if (eq me place)
|
||||
(funcall do place (lambda (v) `(setq ,place ,v)))
|
||||
(gv-get me do))))
|
||||
((not (consp place)) (signal 'gv-invalid-place (list place)))
|
||||
(t
|
||||
(let* ((head (car place))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue