procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cl-macs-tests.el (cl-&key-arguments): Fix regression

Browse source 
* lisp/emacs-lisp/bytecomp.el (byte-compile-form): Turn "cannot use
lexical var" errors into warnings.
Make the obey `with-suppressed-warnings`.

* test/lisp/emacs-lisp/cl-macs-tests.el (cl-&key-arguments):
Suppress warnings.
This commit is contained in:
Stefan Monnier 2023-06-27 16:14:32 -04:00
parent cf4ccc5828
commit 82875b1575
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/emacs-lisp/bytecomp.el
View file

@ -3473,8 +3473,9 @@ lambda-expression."
run-hook-with-args-until-failure))
(pcase (cdr form)
(`(',var . ,_)
(when (memq var byte-compile-lexical-variables)
(byte-compile-report-error
(when (and (memq var byte-compile-lexical-variables)
(byte-compile-warning-enabled-p 'lexical var))
(byte-compile-warn
(format-message "%s cannot use lexical var `%s'" fn var))))))
;; Warn about using obsolete hooks.
(if (memq fn '(add-hook remove-hook))

6
test/lisp/emacs-lisp/cl-macs-tests.el
View file

@ -812,8 +812,10 @@ See Bug#57915."
;; In ELisp function arguments are always statically scoped (bug#47552).
(let ((cl--test-a 'dyn)
;; FIXME: How do we silence the "Lexical argument shadows" warning?
(f (cl-function (lambda (&key cl--test-a b)
(list cl--test-a (symbol-value 'cl--test-a) b)))))
(f
(with-suppressed-warnings ((lexical cl--test-a))
(cl-function (lambda (&key cl--test-a b)
(list cl--test-a (symbol-value 'cl--test-a) b))))))
(should (equal (funcall f :cl--test-a 'lex :b 2) '(lex dyn 2)))))
(cl-defstruct cl--test-s