diff options
Diffstat (limited to '.emacs.d/lisp/init-packages.el')
| -rw-r--r-- | .emacs.d/lisp/init-packages.el | 78 |
1 files changed, 62 insertions, 16 deletions
diff --git a/.emacs.d/lisp/init-packages.el b/.emacs.d/lisp/init-packages.el index 48080d8..55b3eb5 100644 --- a/.emacs.d/lisp/init-packages.el +++ b/.emacs.d/lisp/init-packages.el @@ -3,12 +3,12 @@ ;;; Code: ;; Elpaca installer block -(defvar elpaca-installer-version 0.7) +(defvar elpaca-installer-version 0.11) (defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory)) (defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory)) (defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory)) (defvar elpaca-order '(elpaca :repo "https://github.com/progfolio/elpaca.git" - :ref nil :depth 1 + :ref nil :depth 1 :inherit ignore :files (:defaults "elpaca-test.el" (:exclude "extensions")) :build (:not elpaca--activate-package))) (let* ((repo (expand-file-name "elpaca/" elpaca-repos-directory)) @@ -18,27 +18,27 @@ (add-to-list 'load-path (if (file-exists-p build) build repo)) (unless (file-exists-p repo) (make-directory repo t) - (when (< emacs-major-version 28) (require 'subr-x)) + (when (<= emacs-major-version 28) (require 'subr-x)) (condition-case-unless-debug err - (if-let ((buffer (pop-to-buffer-same-window "*elpaca-bootstrap*")) - ((zerop (apply #'call-process `("git" nil ,buffer t "clone" - ,@(when-let ((depth (plist-get order :depth))) - (list (format "--depth=%d" depth) "--no-single-branch")) - ,(plist-get order :repo) ,repo)))) - ((zerop (call-process "git" nil buffer t "checkout" - (or (plist-get order :ref) "--")))) - (emacs (concat invocation-directory invocation-name)) - ((zerop (call-process emacs nil buffer nil "-Q" "-L" "." "--batch" - "--eval" "(byte-recompile-directory \".\" 0 'force)"))) - ((require 'elpaca)) - ((elpaca-generate-autoloads "elpaca" repo))) + (if-let* ((buffer (pop-to-buffer-same-window "*elpaca-bootstrap*")) + ((zerop (apply #'call-process `("git" nil ,buffer t "clone" + ,@(when-let* ((depth (plist-get order :depth))) + (list (format "--depth=%d" depth) "--no-single-branch")) + ,(plist-get order :repo) ,repo)))) + ((zerop (call-process "git" nil buffer t "checkout" + (or (plist-get order :ref) "--")))) + (emacs (concat invocation-directory invocation-name)) + ((zerop (call-process emacs nil buffer nil "-Q" "-L" "." "--batch" + "--eval" "(byte-recompile-directory \".\" 0 'force)"))) + ((require 'elpaca)) + ((elpaca-generate-autoloads "elpaca" repo))) (progn (message "%s" (buffer-string)) (kill-buffer buffer)) (error "%s" (with-current-buffer buffer (buffer-string)))) ((error) (warn "%s" err) (delete-directory repo 'recursive)))) (unless (require 'elpaca-autoloads nil t) (require 'elpaca) (elpaca-generate-autoloads "elpaca" repo) - (load "./elpaca-autoloads"))) + (let ((load-source-file-function nil)) (load "./elpaca-autoloads")))) (add-hook 'after-init-hook #'elpaca-process-queues) (elpaca `(,@elpaca-order)) ;; End of elpaca installer block @@ -118,6 +118,52 @@ ;; https://github.com/progfolio/elpaca/wiki/Logging#customizing-the-position-of-the-elpaca-log-buffer (add-to-list 'display-buffer-alist '("\\*elpaca-log\\*" (display-buffer-reuse-window display-buffer-at-bottom))) +;; https://github.com/progfolio/elpaca/wiki/Reloading-a-package%E2%80%99s-features-after-updating-a-package +(defun +elpaca-reload-package (package &optional allp) + "Reload PACKAGE's features. +If ALLP is non-nil (interactively, with prefix), load all of its +features; otherwise only load ones that were already loaded. + +This is useful to reload a package after upgrading it. Since a +package may provide multiple features, to reload it properly +would require either restarting Emacs or manually unloading and +reloading each loaded feature. This automates that process. + +Note that this unloads all of the package's symbols before +reloading. Any data stored in those symbols will be lost, so if +the package would normally save that data, e.g. when a mode is +deactivated or when Emacs exits, the user should do so before +using this command." + (interactive + (list (let ((elpaca-overriding-prompt "Reload package: ")) + (elpaca--read-queued)) + current-prefix-arg)) + ;; This finds features in the currently installed version of PACKAGE, so if + ;; it provided other features in an older version, those are not unloaded. + (when (yes-or-no-p (format "Unload all of %s's symbols and reload its features? " package)) + (let* ((package-name (symbol-name package)) + (package-dir (file-name-directory + (locate-file package-name load-path (get-load-suffixes)))) + (package-files (directory-files package-dir 'full (rx ".el" eos))) + (package-features + (cl-loop for file in package-files + when (with-temp-buffer + (insert-file-contents file) + (when (re-search-forward (rx bol "(provide" (1+ space)) nil t) + (goto-char (match-beginning 0)) + (cadadr (read (current-buffer))))) + collect it))) + (unless allp + (setf package-features (seq-intersection package-features features))) + (dolist (feature package-features) + (ignore-errors + ;; Ignore error in case it's not loaded. + (unload-feature feature 'force))) + (dolist (feature package-features) + (require feature)) + (when package-features + (message "Reloaded: %s" (mapconcat #'symbol-name package-features " ")))))) + ;; https://github.com/radian-software/radian/blob/e3aad124c8e0cc870ed09da8b3a4905d01e49769/emacs/radian.el#L352 (defmacro use-feature (name &rest args) "Like `use-package', but without elpaca integration. |