refactor(lib): use cl-callf instead of plist-{put,delete}!

I rediscovered cl-callf and decided to cut down on redundancies.
This commit is contained in:
Henrik Lissner 2022-06-14 20:25:39 +02:00
parent d0cdf8f5c6
commit fd12794930
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
3 changed files with 21 additions and 21 deletions

View file

@ -21,6 +21,7 @@ list, the pair is destructured into (CAR . CDR)."
,@body))
,retval)))
;;; DEPRECATED In favor of `cl-callf'
;;;###autoload
(defmacro plist-put! (plist &rest rest)
"Set each PROP VALUE pair in REST to PLIST in-place."
@ -51,7 +52,7 @@ list, the pair is destructured into (CAR . CDR)."
"Non-destructively merge FROM-PLIST onto TO-PLIST"
(let ((plist (copy-sequence from-plist)))
(while plist
(plist-put! to-plist (pop plist) (pop plist)))
(cl-callf plist-put to-plist (pop plist) (pop plist)))
to-plist))
;;;###autoload
@ -60,7 +61,7 @@ list, the pair is destructured into (CAR . CDR)."
(let (p)
(while plist
(if (car plist)
(plist-put! p (car plist) (nth 1 plist)))
(cl-callf plist-put p (car plist) (nth 1 plist)))
(setq plist (cddr plist)))
p))
@ -70,7 +71,7 @@ list, the pair is destructured into (CAR . CDR)."
(let (p)
(while plist
(if (not (memq (car plist) props))
(plist-put! p (car plist) (nth 1 plist)))
(cl-callf plist-put p (car plist) (nth 1 plist)))
(setq plist (cddr plist)))
p))