[elpa] externals/compat c7578e29f2 1/8: Use with-eval-after-load for updating default values

[ELPA Syncer]

branch: externals/compat
commit c7578e29f28c0672c69e3f455169af2b5e890d9a
Author: Philip Kaludercic <philipk@posteo.net>
Commit: Philip Kaludercic <philipk@posteo.net>

    Use with-eval-after-load for updating default values
    
    At this point, with-eval-after-load should have either be defined by
    compat or by Emacs itself, (and it can serve as a first smoke test).
---
 compat.el | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/compat.el b/compat.el
index a56066fbcb..ce52592ba2 100644
--- a/compat.el
+++ b/compat.el
@@ -165,11 +165,11 @@ advice."
 
 (defvar setup-preserve-defaults nil)
 
-;;;;;; Add NonGNU ELPA to the list of package archives
-(defvar package-archives)
 (unless setup-preserve-defaults
-  (eval-after-load 'package
-    (lambda ()
+  ;; Add NonGNU ELPA to the list of package archives
+  (defvar package-archives)
+  (unless setup-preserve-defaults
+    (with-eval-after-load 'package
       (when (or (equal '(("gnu" . "https://elpa.gnu.org/packages/";))
                        package-archives)
                 (equal '(("gnu" . "http://elpa.gnu.org/packages/";))
@@ -179,14 +179,11 @@ advice."
                             (if (and (fboundp 'gnutls-available-p)
                                      (gnutls-available-p))
                                 "s" "")))
-              package-archives)))))
+              package-archives))))
 
-;; Change the default IRC server from Freenode to Libera.
-(defvar rcirc-server-alist)
-(defvar erc-default-server)
-(unless setup-preserve-defaults
-  (eval-after-load 'rcirc
-    (lambda ()
+  ;; Change the default IRC server from Freenode to Libera.
+  (defvar rcirc-server-alist)
+  (with-eval-after-load 'rcirc
       (when (equal '(("chat.freenode.net" :channels ("#rcirc")))
                    rcirc-server-alist)
         (setq rcirc-server-alist
@@ -197,11 +194,12 @@ advice."
                   ;; feature that doesn't need to be added here.
                   '(("irc.libera.chat" :channels ("#rcirc")
                      :port 6697 :encryption tls))
-                '(("irc.libera.chat" :channels ("#rcirc"))))))))
-  (eval-after-load 'erc
-    (lambda ()
+                '(("irc.libera.chat" :channels ("#rcirc")))))))
+
+  (defvar erc-default-server)
+    (with-eval-after-load 'erc
       (when (equal erc-default-server "irc.freenode.net")
-        (setq erc-default-server "irc.libera.chat")))))
+        (setq erc-default-server "irc.libera.chat"))))
 
 (provide 'compat)
 ;;; compat.el ends here