nebkor/emacs-dot-d
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update elpaca

Browse source
This commit is contained in:
Joe Ardent 2025-06-15 10:29:04 -07:00
parent d8cab4e766
commit bf9b17e6e5
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
init.el
View file

@ -28,8 +28,7 @@
'("nebkor-modules" "custom-lisp")) '("nebkor-modules" "custom-lisp"))
;;; Install Elpaca ;;; Install Elpaca
(defvar elpaca-installer-version 0.11)
(defvar elpaca-installer-version 0.10)
(defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory)) (defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
(defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory)) (defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
(defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory)) (defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))
@ -44,6 +43,7 @@
(add-to-list 'load-path (if (file-exists-p build) build repo)) (add-to-list 'load-path (if (file-exists-p build) build repo))
(unless (file-exists-p repo) (unless (file-exists-p repo)
(make-directory repo t) (make-directory repo t)
(when (<= emacs-major-version 28) (require 'subr-x))
(condition-case-unless-debug err (condition-case-unless-debug err
(if-let* ((buffer (pop-to-buffer-same-window "*elpaca-bootstrap*")) (if-let* ((buffer (pop-to-buffer-same-window "*elpaca-bootstrap*"))
((zerop (apply #'call-process `("git" nil ,buffer t "clone" ((zerop (apply #'call-process `("git" nil ,buffer t "clone"
@ -63,10 +63,11 @@
(unless (require 'elpaca-autoloads nil t) (unless (require 'elpaca-autoloads nil t)
(require 'elpaca) (require 'elpaca)
(elpaca-generate-autoloads "elpaca" repo) (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) (add-hook 'after-init-hook #'elpaca-process-queues)
(elpaca `(,@elpaca-order)) (elpaca `(,@elpaca-order))
;; Install use-package support for Elpaca ;; Install use-package support for Elpaca
(elpaca elpaca-use-package (elpaca elpaca-use-package
;; Enable use-package :ensure support for Elpaca. ;; Enable use-package :ensure support for Elpaca.

10
nebkor-emacs.org
View file

@ -499,9 +499,8 @@ When using ~elpaca~, here are some gotchas you should be aware of
assumptions about order of execution. assumptions about order of execution.
#+begin_src emacs-lisp :tangle "init.el" #+begin_src emacs-lisp :tangle "init.el"
;;; Install Elpaca ;;; Install Elpaca
(defvar elpaca-installer-version 0.11)
(defvar elpaca-installer-version 0.10)
(defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory)) (defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
(defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory)) (defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
(defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory)) (defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))
@ -516,6 +515,7 @@ When using ~elpaca~, here are some gotchas you should be aware of
(add-to-list 'load-path (if (file-exists-p build) build repo)) (add-to-list 'load-path (if (file-exists-p build) build repo))
(unless (file-exists-p repo) (unless (file-exists-p repo)
(make-directory repo t) (make-directory repo t)
(when (<= emacs-major-version 28) (require 'subr-x))
(condition-case-unless-debug err (condition-case-unless-debug err
(if-let* ((buffer (pop-to-buffer-same-window "*elpaca-bootstrap*")) (if-let* ((buffer (pop-to-buffer-same-window "*elpaca-bootstrap*"))
((zerop (apply #'call-process `("git" nil ,buffer t "clone" ((zerop (apply #'call-process `("git" nil ,buffer t "clone"
@ -535,10 +535,11 @@ When using ~elpaca~, here are some gotchas you should be aware of
(unless (require 'elpaca-autoloads nil t) (unless (require 'elpaca-autoloads nil t)
(require 'elpaca) (require 'elpaca)
(elpaca-generate-autoloads "elpaca" repo) (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) (add-hook 'after-init-hook #'elpaca-process-queues)
(elpaca `(,@elpaca-order)) (elpaca `(,@elpaca-order))
;; Install use-package support for Elpaca ;; Install use-package support for Elpaca
(elpaca elpaca-use-package (elpaca elpaca-use-package
;; Enable use-package :ensure support for Elpaca. ;; Enable use-package :ensure support for Elpaca.
@ -3475,6 +3476,7 @@ consistency with your overall coding environment.
(use-package difftastic)) (use-package difftastic))
(use-package difftastic-bindings (use-package difftastic-bindings
:after difftastic
:config (difftastic-bindings-mode)) :config (difftastic-bindings-mode))
#+end_src #+end_src

1
nebkor-modules/nebkor-git.el
View file

@ -79,6 +79,7 @@
(use-package difftastic)) (use-package difftastic))
(use-package difftastic-bindings (use-package difftastic-bindings
:after difftastic
:config (difftastic-bindings-mode)) :config (difftastic-bindings-mode))
(provide 'nebkor-git) (provide 'nebkor-git)