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

fix(lib): doom-plist-merge causing side-effects

Browse source 
This one was sneaky. `doom-plist-merge` was mutating the second plist
fed to it, causing issues upwind of its uses. In #7925, for example,
calling `doom-package-recipe` to read a package's recipe would end up
altering it, copying sub-properties of :recipe to other packages'
recipes.

If you've hit #7925, you'll also need to delete your build-cache to get
around the error. I.e.

  rm -f $EMACSDIR/.local/straight/build-*-cache.el
  doom sync  # or upgrade

Fix: #7925
This commit is contained in:
Henrik Lissner 2024-07-09 02:38:23 -04:00
parent 96de02c769
commit 944eef90ec
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/lib/plist.el
View file

@ -29,9 +29,10 @@
;;;###autoload ;;;###autoload
(defun doom-plist-merge (from-plist to-plist) (defun doom-plist-merge (from-plist to-plist)
"Non-destructively merge FROM-PLIST onto TO-PLIST" "Non-destructively merge FROM-PLIST onto TO-PLIST"
(let ((plist (copy-sequence from-plist))) (let ((from-plist (copy-sequence from-plist))
(while plist (to-plist (copy-sequence to-plist)))
(cl-callf plist-put to-plist (pop plist) (pop plist))) (while from-plist
(cl-callf plist-put to-plist (pop from-plist) (pop from-plist)))
to-plist)) to-plist))
;;;###autoload ;;;###autoload