Merge branch 'main' of https://tildegit.org/acdw/emacs

init.el

@@ -25,10 +25,7 @@
 (setup setup
   (setup-define :straight
     (lambda (recipe)
-      `(or (ignore-errors (straight-use-package ',recipe))
-           (progn
-             (message "Straight error: %S" ',recipe)
-             (throw 'setup-exit nil))))
+      `(straight-use-package ',recipe))
     :documentation "Install RECIPE with `straight-use-package'."
     :repeatable t
     :shorthand (lambda (sexp)
@@ -268,35 +265,35 @@
   (:also-load erc-autoaway
               erc-track)
   
-  (:option erc-auto-discard-away t
-           erc-autoaway-idle-seconds 600
-           erc-autoaway-message "BRB (autoaway: %i seconds)"
-           erc-autojoin-channels-alist '(("libera.chat"
-                                          "#emacs" "##webpals")
-                                         ("tilde.chat"
-                                          "#meta" "#team" "#gemini"
-                                          "#bread" ; how could I've forgotten!?
-                                          "#politics" "#bungame"))
-           erc-button-url-regexp browse-url-button-regexp
-           (append erc-common-server-suffixes)  '("tilde.chat\\'" . "~")
-           (append erc-common-server-suffixes)  '("libera.chat\\'" . "LC")
-           erc-header-line-face-method
-           #'erc/update-header-line-show-disconnected
-           erc-hide-list '("JOIN" "NICK" "PART" "QUIT" "MODE"
-                           "324" "329" "332" "333" "353" "477")
-           erc-interpret-mirc-color t
-           erc-join-buffer 'bury
-           erc-kill-buffer-on-part t
-           erc-kill-queries-on-quit t
-           erc-kill-server-buffer-on-quit t
-           erc-nick "acdw"
-           erc-prompt (lambda () (concat (buffer-name) ">"))
-           erc-prompt-for-password nil ; use ~/.authinfo
-           erc/servers '("irc.libera.chat"
-                         "irc.tilde.chat")
-           erc-server-coding-system '(utf-8 . utf-8)
-           erc-track-exclude-types erc-hide-list
-           erc-track-position-in-mode-line 'before-modes)
+  (:option
+   erc-auto-discard-away t
+   erc-autoaway-idle-seconds 600
+   erc-autoaway-message "BRB (autoaway: %i seconds)"
+   erc-autojoin-channels-alist '(("libera.chat"
+                                  "#emacs" "##webpals")
+                                 ("tilde.chat"
+                                  "#meta" "#team" "#gemini"
+                                  "#bread" ; how could I've forgotten!?
+                                  "#politics" "#bungame"))
+   erc-button-url-regexp browse-url-button-regexp
+   erc-common-server-suffixes '(("tilde.chat\\'" . "~")
+                                ("libera.chat\\'" . "LC"))
+   erc-header-line-face-method #'erc/update-header-line-show-disconnected
+   erc-hide-list '("JOIN" "NICK" "PART" "QUIT" "MODE"
+                   "324" "329" "332" "333" "353" "477")
+   erc-interpret-mirc-color t
+   erc-join-buffer 'bury
+   erc-kill-buffer-on-part t
+   erc-kill-queries-on-quit t
+   erc-kill-server-buffer-on-quit t
+   erc-nick "acdw"
+   erc-prompt (lambda () (concat (buffer-name) ">"))
+   erc-prompt-for-password nil ; use ~/.authinfo
+   erc/servers '("irc.libera.chat"
+                 "irc.tilde.chat")
+   erc-server-coding-system '(utf-8 . utf-8)
+   erc-track-exclude-types erc-hide-list
+   erc-track-position-in-mode-line 'before-modes)
 
   ;; Thanks bpalmer!
   (advice-add 'show-paren-function :around
@@ -784,9 +781,9 @@
            "M-g f" avy-goto-line
            "M-g w" avy-goto-word-1
            "C-c C-j" avy-resume)
-  
-  (eval-after-load "isearch"
-    '(define-key isearch-mode-map (kbd "C-'") #'avy-isearch)))
+
+  (with-eval-after-load "isearch"
+    (define-key isearch-mode-map (kbd "C-'") #'avy-isearch)))
 
 (setup (:straight (beginend))
   (beginend-global-mode +1))