From bf9b17e6e596e39ec5f380cbfe272a8fe0db293e Mon Sep 17 00:00:00 2001
From: Joe Ardent <code@ardent.nebcorp.com>
Date: Sun, 15 Jun 2025 10:29:04 -0700
Subject: [PATCH] update elpaca

---
 init.el                      |  7 ++++---
 nebkor-emacs.org             | 10 ++++++----
 nebkor-modules/nebkor-git.el |  1 +
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/init.el b/init.el
index 3c2287b..8bf2a86 100644
--- a/init.el
+++ b/init.el
@@ -28,8 +28,7 @@
  '("nebkor-modules" "custom-lisp"))
 
 ;;; Install Elpaca
-
-(defvar elpaca-installer-version 0.10)
+(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))
@@ -44,6 +43,7 @@
   (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))
     (condition-case-unless-debug err
         (if-let* ((buffer (pop-to-buffer-same-window "*elpaca-bootstrap*"))
                   ((zerop (apply #'call-process `("git" nil ,buffer t "clone"
@@ -63,10 +63,11 @@
   (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))
 
+
 ;; Install use-package support for Elpaca
 (elpaca elpaca-use-package
   ;; Enable use-package :ensure support for Elpaca.
diff --git a/nebkor-emacs.org b/nebkor-emacs.org
index 7366277..64bd45e 100644
--- a/nebkor-emacs.org
+++ b/nebkor-emacs.org
@@ -499,9 +499,8 @@ When using ~elpaca~, here are some gotchas you should be aware of
    assumptions about order of execution.
 
 #+begin_src emacs-lisp :tangle "init.el"
-    ;;; Install Elpaca
-
-  (defvar elpaca-installer-version 0.10)
+  ;;; Install Elpaca
+  (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))
@@ -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))
     (unless (file-exists-p repo)
       (make-directory repo t)
+      (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"
@@ -535,10 +535,11 @@ When using ~elpaca~, here are some gotchas you should be aware of
     (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))
 
+
   ;; Install use-package support for Elpaca
   (elpaca elpaca-use-package
     ;; Enable use-package :ensure support for Elpaca.
@@ -3475,6 +3476,7 @@ consistency with your overall coding environment.
       (use-package difftastic))
 
   (use-package difftastic-bindings
+    :after difftastic
     :config (difftastic-bindings-mode))
 #+end_src
 
diff --git a/nebkor-modules/nebkor-git.el b/nebkor-modules/nebkor-git.el
index 61c8a96..5e11a86 100644
--- a/nebkor-modules/nebkor-git.el
+++ b/nebkor-modules/nebkor-git.el
@@ -79,6 +79,7 @@
     (use-package difftastic))
 
 (use-package difftastic-bindings
+  :after difftastic
   :config (difftastic-bindings-mode))
 
 (provide 'nebkor-git)