Skip to content

Commit

Permalink
Merge pull request #87 from leungbk/package--prepare-dependencies
Browse files Browse the repository at this point in the history
Account for Emacs 30's relocation of package--prepare-dependencies
  • Loading branch information
purcell authored Dec 24, 2023
2 parents fa83e81 + 1de4f6c commit c48aa07
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions package-build.el
Original file line number Diff line number Diff line change
Expand Up @@ -1085,10 +1085,12 @@ value specified in the file \"NAME.el\"."
^;;; [^ ]*\\.el ---[ \t]*\\(.*?\\)[ \t]*\\(-\\*-.*-\\*-[ \t]*\\)?$" nil t)
(match-string-no-properties 1)))
"No description available.")
(when-let ((require-lines (lm-header-multiline "package-requires")))
(package--prepare-dependencies
(package-read-from-string
(mapconcat #'identity require-lines " "))))
(if (fboundp 'lm-package-requires)
(lm-package-requires)
(when-let ((require-lines (lm-header-multiline "package-requires")))
(package--prepare-dependencies
(package-read-from-string
(mapconcat #'identity require-lines " ")))))
;; `:kind' and `:archive' are handled separately.
:kind (or kind 'single)
;; The other keyword arguments are appended to the alist
Expand Down

0 comments on commit c48aa07

Please sign in to comment.