mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-24 06:20:43 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/emacs-lisp/map.el (map--make-pcase-bindings): Fix use in Emacs<30

Browse source
This commit is contained in:
Stefan Monnier 2024-02-21 08:49:15 -05:00
parent 7b0d750188
commit 3b34c5e4a5
1 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
lisp/emacs-lisp/map.el
View file

@ -608,19 +608,30 @@ This allows using default values for `map-elt', which can't be
done using `pcase--flip'.
KEY is the key sought in the map. DEFAULT is the default value."
;; It's obsolete in Emacs>29, but `map.el' is distributed via GNU ELPA
;; for earlier Emacsen.
(declare (obsolete _ "30.1"))
`(map-elt ,map ,key ,default))
(defun map--make-pcase-bindings (args)
"Return a list of pcase bindings from ARGS to the elements of a map."
(mapcar (lambda (elt)
(cond ((consp elt)
`(app (map-elt _ ,(car elt) ,(caddr elt))
,(cadr elt)))
((keywordp elt)
(let ((var (intern (substring (symbol-name elt) 1))))
`(app (map-elt _ ,elt) ,var)))
(t `(app (map-elt _ ',elt) ,elt))))
(mapcar (if (< emacs-major-version 30)
(lambda (elt)
(cond ((consp elt)
`(app (map--pcase-map-elt ,(car elt) ,(caddr elt))
,(cadr elt)))
((keywordp elt)
(let ((var (intern (substring (symbol-name elt) 1))))
`(app (pcase--flip map-elt ,elt) ,var)))
(t `(app (pcase--flip map-elt ',elt) ,elt))))
(lambda (elt)
(cond ((consp elt)
`(app (map-elt _ ,(car elt) ,(caddr elt))
,(cadr elt)))
((keywordp elt)
(let ((var (intern (substring (symbol-name elt) 1))))
`(app (map-elt _ ,elt) ,var)))
(t `(app (map-elt _ ',elt) ,elt)))))
args))
(defun map--make-pcase-patterns (args)