From ee9119ab00c9740d12a2d6c4a9d4fb567802272c Mon Sep 17 00:00:00 2001
From: Case Duckworth
Date: Mon, 30 Aug 2021 22:16:21 -0500
Subject: Use global-goto-address-mode instead of individual hooks

---
 init.el             | 3 +--
 lisp/acdw-compat.el | 6 ++++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/init.el b/init.el
index 1a54c79..3bec7f4 100644
--- a/init.el
+++ b/init.el
@@ -524,8 +524,7 @@ like a dumbass."
   (:global "C-c n" gnus))
 
 (setup goto-addr
-  (add-hook 'text-mode-hook #'goto-address-mode)
-  (add-hook 'prog-mode-hook #'goto-address-prog-mode))
+  (global-goto-address-mode +1))
 
 (setup ibuffer
   (:also-load ibuf-ext)
diff --git a/lisp/acdw-compat.el b/lisp/acdw-compat.el
index 17df856..f9ba9af 100644
--- a/lisp/acdw-compat.el
+++ b/lisp/acdw-compat.el
@@ -562,5 +562,11 @@ Used in `repeat-mode'.")
     (put command 'repeat-map 'outline-editing-repeat-map))
   )
 
+;;; goto-address-mode
+(unless (fboundp 'global-goto-address-mode)
+  (define-globalized-minor-mode global-goto-address-mode
+    goto-address-mode goto-addr-mode--turn-on
+    :version "28.1"))
+
 (provide 'acdw-compat)
 ;;; acdw-compat.el ends here
-- 
cgit 1.4.1-21-gabe81