diff --git a/emacs/init.el b/emacs/init.el index c2c3a76..a1e514c 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -49,6 +49,20 @@ (elpaca-use-package-mode)) (elpaca-wait) +;; Magit depends on newer versions of seq/transient than Emacs bundles, but Elpaca +;; can't or won't update them on its own. +(defun +elpaca-unload-seq (e) + (and (featurep 'seq) (unload-feature 'seq t)) + (elpaca--continue-build e)) + +(defun +elpaca-seq-build-steps () + (append (butlast (if (file-exists-p (expand-file-name "seq" elpaca-builds-directory)) + elpaca--pre-built-steps elpaca-build-steps)) + (list '+elpaca-unload-seq 'elpaca--activate-package))) + +(use-package seq :ensure `(seq :build ,(+elpaca-seq-build-steps))) +(use-package transient :ensure t) + ;;; OS-specific tweaks (defconst ON-LINUX (eq system-type 'gnu/linux)) (defconst ON-MAC (eq system-type 'darwin))