mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-02 20:16:25 +00:00
Code Issues Releases Activity

* lisp/emacs-lisp/map.el: Restore compatibility with Emacs-26

Browse Source 
Don't use the new `eql` syntax.
This commit is contained in:
Stefan Monnier 2021-09-28 10:29:27 -04:00
parent 2c3c4446cf
commit fa92b040c6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lisp/emacs-lisp/map.el
View File

@ -5,7 +5,7 @@
;; Author: Nicolas Petton <nicolas@petton.fr> ;; Author: Nicolas Petton <nicolas@petton.fr>
;; Maintainer: emacs-devel@gnu.org ;; Maintainer: emacs-devel@gnu.org
;; Keywords: extensions, lisp ;; Keywords: extensions, lisp
;; Version: 3.2 ;; Version: 3.2.1
;; Package-Requires: ((emacs "26")) ;; Package-Requires: ((emacs "26"))
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
@ -427,15 +427,15 @@ See `map-into' for all supported values of TYPE."
"Convert MAP into a map of TYPE.") "Convert MAP into a map of TYPE.")
;; FIXME: I wish there was a way to avoid this η-redex! ;; FIXME: I wish there was a way to avoid this η-redex!
(cl-defmethod map-into (map (_type (eql 'list))) (cl-defmethod map-into (map (_type (eql list)))
"Convert MAP into an alist." "Convert MAP into an alist."
(map-pairs map)) (map-pairs map))
(cl-defmethod map-into (map (_type (eql 'alist))) (cl-defmethod map-into (map (_type (eql alist)))
"Convert MAP into an alist." "Convert MAP into an alist."
(map-pairs map)) (map-pairs map))
(cl-defmethod map-into (map (_type (eql 'plist))) (cl-defmethod map-into (map (_type (eql plist)))
"Convert MAP into a plist." "Convert MAP into a plist."
(let (plist) (let (plist)
(map-do (lambda (k v) (setq plist `(,v ,k ,@plist))) map) (map-do (lambda (k v) (setq plist `(,v ,k ,@plist))) map)
@ -530,7 +530,7 @@ KEYWORD-ARGS are forwarded to `make-hash-table'."
map) map)
ht)) ht))
(cl-defmethod map-into (map (_type (eql 'hash-table))) (cl-defmethod map-into (map (_type (eql hash-table)))
"Convert MAP into a hash-table with keys compared with `equal'." "Convert MAP into a hash-table with keys compared with `equal'."
(map--into-hash map (list :size (map-length map) :test #'equal))) (map--into-hash map (list :size (map-length map) :test #'equal)))