3 files changed, 11 insertions, 4 deletions

@@ -16,7 +16,10 @@
 
 ;;; Code:
 
+(setq debug-on-error t)
+
 (dolist (feature `((early-init . ,(locate-user-emacs-file "early-init"))
+                   acdw
                    private
                    _work))
   (require (or (car-safe feature) feature) (cdr-safe feature) :noerror))
@@ -743,8 +746,8 @@ See also `crux-reopen-as-root-mode'."
   (:+key "C-." #'embark-act
          "M-." #'embark-dwim
          "<f1> B" #'embark-bindings)
-  (:bind-into minibuffer
-    "C-." #'embark-act))
+  (:with-map minibuffer-local-map
+    (:bind "C-." #'embark-act)))
 
 (setup (:straight embark-consult)
   (:load-after consult embark)
@@ -273,7 +273,9 @@ kill without asking."
 (when (require 'repeat nil :noerror)
   (setq-default repeat-exit-key "g"
                     repeat-exit-timeout 5)
-  (repeat-mode +1))
+  (when (fboundp 'repeat-mode)
+    ;; `repeat-mode' is defined in repeat.el, which is an older library.
+    (repeat-mode +1)))
 
 (when (require 'savehist nil :noerror)
   (setq-default history-length t
@@ -4,7 +4,9 @@
 
 (require 'cl-lib)
 ;; We don't require `org-capture' here because I'll have to require this library
-;; to init.el /before/ org-capture is fully needed.
+;; to init.el /before/ org-capture is fully needed.  But I do need to declare
+;; `org-capture-templates'.
+(defvar org-capture-templates nil)
 
 (defun +org-capture--get (key &optional list)
   "Find KEY in LIST, or return nil.