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

fix(lib): doom/bumpify-diff: skip non-package! forms

Browse source 
Would formerly error out if it tries to read invalid forms in misc files
included in bump commits.
This commit is contained in:
Henrik Lissner 2023-11-29 16:29:42 -05:00
parent d55b078fa1
commit 88c59129ec
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lisp/lib/packages.el
View file

@ -239,13 +239,14 @@ Must be run from a magit diff buffer."
(unless (= (length before) (length after)) (unless (= (length before) (length after))
(user-error "Uneven number of packages being bumped")) (user-error "Uneven number of packages being bumped"))
(dolist (p1 before) (dolist (p1 before)
(cl-destructuring-bind (package &key plist _beg _end &allow-other-keys) p1 (when (and (listp p1) (eq (car p1) 'package!))
(let ((p2 (cdr (assq package after)))) (cl-destructuring-bind (package &key plist _beg _end &allow-other-keys) p1
(if (null p2) (let ((p2 (cdr (assq package after))))
(push package errors) (if (null p2)
(let ((bstr1 (doom--package-to-bump-string package plist)) (push package errors)
(bstr2 (doom--package-to-bump-string package (plist-get p2 :plist)))) (let ((bstr1 (doom--package-to-bump-string package plist))
(cl-pushnew (format "%s -> %s" bstr1 bstr2) lines :test #'equal)))))) (bstr2 (doom--package-to-bump-string package (plist-get p2 :plist))))
(cl-pushnew (format "%s -> %s" bstr1 bstr2) lines :test #'equal)))))))
(if (null lines) (if (null lines)
(user-error "No bumps to bumpify") (user-error "No bumps to bumpify")
(prog1 (funcall (if interactive #'kill-new #'identity) (prog1 (funcall (if interactive #'kill-new #'identity)