[elpa] externals/compat 4143e6e2e0 2/2: Rename setup-preserve-defaults to compat-preserve-defaults

[ELPA Syncer]

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

    Rename setup-preserve-defaults to compat-preserve-defaults
    
    I keep on confusing setup.el and compat.el.
---
 compat.el | 57 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/compat.el b/compat.el
index ce52592ba2..d3f2e50a71 100644
--- a/compat.el
+++ b/compat.el
@@ -160,46 +160,45 @@ advice."
 ;; versions of Emacs.
 ;;
 ;; To prevent these changes from taking effect, set
-;; `setup-preserve-defaults' to t in your early-init.el on Emacs 27 or
+;; `compat-preserve-defaults' to t in your early-init.el on Emacs 27 or
 ;; before calling `package-initialize' before Emacs 27.
 
-(defvar setup-preserve-defaults nil)
+(defvar compat-preserve-defaults nil)
 
-(unless setup-preserve-defaults
+(unless compat-preserve-defaults
   ;; 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/";))
-                       package-archives))
-        (push (cons "nongnu"
-                    (format "http%s://elpa.nongnu.org/nongnu/"
-                            (if (and (fboundp 'gnutls-available-p)
-                                     (gnutls-available-p))
-                                "s" "")))
-              package-archives))))
+  (with-eval-after-load 'package
+    (when (or (equal '(("gnu" . "https://elpa.gnu.org/packages/";))
+                     package-archives)
+              (equal '(("gnu" . "http://elpa.gnu.org/packages/";))
+                     package-archives))
+      (push (cons "nongnu"
+                  (format "http%s://elpa.nongnu.org/nongnu/"
+                          (if (and (fboundp 'gnutls-available-p)
+                                   (gnutls-available-p))
+                              "s" "")))
+            package-archives)))
 
   ;; 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
-              (if (and (fboundp 'gnutls-available-p)
-                       (gnutls-available-p))
-                  ;; The #emacs channel is not added here (even though
-                  ;; it was added in 28.1), since that is a separate
-                  ;; feature that doesn't need to be added here.
-                  '(("irc.libera.chat" :channels ("#rcirc")
-                     :port 6697 :encryption tls))
-                '(("irc.libera.chat" :channels ("#rcirc")))))))
+    (when (equal '(("chat.freenode.net" :channels ("#rcirc")))
+                 rcirc-server-alist)
+      (setq rcirc-server-alist
+            (if (and (fboundp 'gnutls-available-p)
+                     (gnutls-available-p))
+                ;; The #emacs channel is not added here (even though
+                ;; it was added in 28.1), since that is a separate
+                ;; feature that doesn't need to be added here.
+                '(("irc.libera.chat" :channels ("#rcirc")
+                   :port 6697 :encryption tls))
+              '(("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"))))
+  (with-eval-after-load 'erc
+    (when (equal erc-default-server "irc.freenode.net")
+      (setq erc-default-server "irc.libera.chat"))))
 
 (provide 'compat)
 ;;; compat.el ends here