gitback/doomemacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix oversights in plist library

Browse Source 
- doplist! now returns the RETVAL expression
- Fix doom-plist-merge (was incomplete)
This commit is contained in:
Henrik Lissner 2019-07-28 14:14:42 +02:00
parent 3330501af6
commit 8773d85db0
No known key found for this signature in database
GPG Key ID: 5F6C0EA160557395
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/autoload/plist.el
View File

@ -18,13 +18,13 @@ list, the pair is destructured into (CAR . CDR)."
(,(pop arglist) (pop ,plist-var))) (,(pop arglist) (pop ,plist-var)))
`((,arglist (cons (pop ,plist-var) `((,arglist (cons (pop ,plist-var)
(pop ,plist-var))))) (pop ,plist-var)))))
,@body))))) ,@body))
,retval)))
;;;###autoload ;;;###autoload
(defmacro plist-put! (plist prop value) (defmacro plist-put! (plist prop value)
"Set PROP to VALUE in PLIST in-place." "Set PROP to VALUE in PLIST in-place."
(let ((plist-var (make-symbol "plist"))) `(setq ,plist (plist-put ,plist ,prop ,value)))
`(setq ,plist (plist-put ,plist ,prop ,value))))
;;;###autoload ;;;###autoload
(defmacro plist-delete! (plist prop) (defmacro plist-delete! (plist prop)
@ -63,8 +63,10 @@ BODY."
;;;###autoload ;;;###autoload
(defun doom-plist-merge (from-plist to-plist) (defun doom-plist-merge (from-plist to-plist)
"Destructively merge FROM-PLIST onto TO-PLIST" "Destructively merge FROM-PLIST onto TO-PLIST"
(let ((plist (copy-sequence from-plist)))
(while plist (while plist
(plist-put! old-plist (pop plist) (pop plist)))) (plist-put! to-plist (pop plist) (pop plist)))
to-plist))
;;;###autoload ;;;###autoload
(defun doom-plist-delete-nil (plist) (defun doom-plist-delete-nil (plist)