Bump :core
Fuco1/smartparens@7f5825d -> Fuco1/smartparens@63695c6 bbatsov/projectile@d1cfad0 -> bbatsov/projectile@c31bd41 domtronn/all-the-icons.el@6917b08 -> domtronn/all-the-icons.el@9aa16ae iqbalansari/restart-emacs@e570749 -> iqbalansari/restart-emacs@1607da2 jscheid/dtrt-indent@a7ade6d -> jscheid/dtrt-indent@854b9a1 justbur/emacs-which-key@ca268fd -> justbur/emacs-which-key@428aedf jwiegley/use-package@caa92f1 -> jwiegley/use-package@365c73d raxod502/straight.el@3277e1c -> raxod502/straight.el@a32c97c + Closes #4513 + Fixes (wrong-number-of-arguments (3 . 4) 2) error for users on Emacs HEAD (see bbatsov/projectile#1635). + package! :build semantics have changed due to upstream changes. What was :build is now :pre-build. What was :no-build is now :build nil. + Now we must be careful not to auto-disable the "use-package" psuedo theme. It is used as a place to store :custom assignments without them being saved to custom.el.
This commit is contained in:
parent
c8bfbda556
commit
cfb8a866dc
6 changed files with 59 additions and 32 deletions
|
@ -13,18 +13,24 @@
|
|||
;;
|
||||
;;; Bump commands
|
||||
|
||||
(defun doom--package-full-recipe (package plist)
|
||||
(defun doom--package-merge-recipes (package plist)
|
||||
(require 'straight)
|
||||
(doom-plist-merge
|
||||
(plist-get plist :recipe)
|
||||
(or (cdr (straight-recipes-retrieve package))
|
||||
(plist-get (cdr (assq package doom-packages))
|
||||
:recipe))))
|
||||
(if-let (recipe (straight-recipes-retrieve package))
|
||||
(cdr (if (memq (car recipe) '(quote \`))
|
||||
(eval recipe t)
|
||||
recipe))
|
||||
(let ((recipe (plist-get (cdr (assq package doom-packages))
|
||||
:recipe)))
|
||||
(if (keywordp (car recipe))
|
||||
recipe
|
||||
(cdr recipe))))))
|
||||
|
||||
(defun doom--package-to-bump-string (package plist)
|
||||
"Return a PACKAGE and its PLIST in 'username/repo@commit' format."
|
||||
(format "%s@%s"
|
||||
(plist-get (doom--package-full-recipe package plist) :repo)
|
||||
(plist-get (doom--package-merge-recipes package plist) :repo)
|
||||
(substring-no-properties (plist-get plist :pin) 0 7)))
|
||||
|
||||
(defun doom--package-at-point (&optional point)
|
||||
|
@ -78,7 +84,7 @@ Grabs the latest commit id of the package using 'git'."
|
|||
(cl-destructuring-bind (&key package plist beg end)
|
||||
(or (doom--package-at-point)
|
||||
(user-error "Not on a `package!' call"))
|
||||
(let* ((recipe (doom--package-full-recipe package plist))
|
||||
(let* ((recipe (doom--package-merge-recipes package plist))
|
||||
(branch (plist-get recipe :branch))
|
||||
(oldid (or (plist-get plist :pin)
|
||||
(doom-package-get package :pin)))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue