emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: replace doom-enlist with ensure-list

Browse source 
doom-enlist is now a deprecated alias for ensure-list, which is built
into Emacs 28.1+ and is its drop-in replacement. We've already
backported it for 27.x users in doom-lib (in 4bf4978).

Ref: 4bf49785fd
This commit is contained in:
Henrik Lissner 2022-08-07 12:24:14 +02:00
parent 1abcf913aa
commit 057e6c531c
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
28 changed files with 41 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/doom-cli-lib.el
View file

@ -216,7 +216,7 @@ execution. Can be generated from a `doom-cli-context' with
This means that all non-keywords are strings, any prefixes provided by PLIST are
prepended, and the keyword is in front."
(let* ((command (doom-enlist command))
(let* ((command (ensure-list command))
(prefix (plist-get plist :prefix))
(prefix (if prefix (doom-cli-command-normalize
prefix (append `(:prefix nil) plist))))
@ -435,14 +435,14 @@ If RECURSIVE, includes breadcrumbs leading up to COMMANDSPEC."
collect command)))
(seq-reduce (lambda (init next)
(nconc (cl-loop with firstlen = (length (car init))
for seg in (doom-enlist next)
for seg in (ensure-list next)
nconc
(cl-loop for command in init
while (= (length command) firstlen)
collect (append command (list seg))))
init))
(cdr commandspec)
`(,@(mapcar #'list (doom-enlist (car commandspec)))))))
`(,@(mapcar #'list (ensure-list (car commandspec)))))))
(defun doom-cli--parse-docs (docs)
(when (and (stringp docs)
@ -1639,7 +1639,7 @@ yet. They won't be included in command listings (by help documentation)."
(push `(cl-callf plist-put doom-cli--plist
,key ,(if (eq key :prefix)
`(append (plist-get doom-cli--plist ,key)
(doom-enlist ,val))
(ensure-list ,val))
val))
forms)))
(nreverse forms))