From a947f64ff2e5ce4af9ca89a00aac562f319c64bc Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Mon, 30 Dec 2019 23:59:46 -0500
Subject: [PATCH] Replace ace-link with link-hint

Better link support, easier to extend, and maintained more actively.
---
 modules/app/twitter/autoload.el           |  1 +
 modules/config/default/+emacs-bindings.el | 10 +++++-----
 modules/config/default/+evil-bindings.el  | 10 +++++-----
 modules/config/default/config.el          |  6 ++----
 modules/config/default/packages.el        |  2 +-
 5 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/modules/app/twitter/autoload.el b/modules/app/twitter/autoload.el
index 1116633be..7c6d7c065 100644
--- a/modules/app/twitter/autoload.el
+++ b/modules/app/twitter/autoload.el
@@ -83,6 +83,7 @@ that works with the feature/popup module."
   "Open a visible link, username or hashtag in a `twittering-mode' buffer."
   (interactive)
   (require 'avy)
+  ;; REVIEW Is this necessary anymore with `link-hint'
   (let ((pt (avy-with +twitter/ace-link
               (avy--process
                (+twitter--collect-links)
diff --git a/modules/config/default/+emacs-bindings.el b/modules/config/default/+emacs-bindings.el
index 45c809563..be474329e 100644
--- a/modules/config/default/+emacs-bindings.el
+++ b/modules/config/default/+emacs-bindings.el
@@ -65,7 +65,7 @@
         :desc "Search other directory"       "D" #'+default/search-other-cwd
         :desc "Locate file"                  "f" #'locate
         :desc "Jump to symbol"               "i" #'imenu
-        :desc "Jump to visible link"         "l" #'ace-link
+        :desc "Jump to visible link"         "l" #'link-hint-open-link
         :desc "Jump to link"                 "L" #'ffap-menu
         :desc "Jump list"                    "j" #'evil-show-jumps
         :desc "Jump to mark"                 "m" #'evil-show-marks
@@ -350,22 +350,22 @@
       ;;; help and info
       (:after help-mode
         :map help-mode-map
-        "o" #'ace-link-help
+        "o" #'link-hint-open-link
         ">" #'help-go-forward
         "<" #'help-go-back
         "n" #'forward-button
         "p" #'backward-button)
       (:after helpful
         :map helpful-mode-map
-        "o" #'ace-link-help)
+        "o" #'link-hint-open-link)
       (:after apropos
         :map apropos-mode-map
-        "o" #'ace-link-help
+        "o" #'link-hint-open-link
         "n" #'forward-button
         "p" #'backward-button)
       (:after info
         :map Info-mode-map
-        "o" #'ace-link-info)
+        "o" #'link-hint-open-link)
 
       ;;; ivy & counsel
       (:when (featurep! :completion ivy)
diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el
index 91d4fa52d..c6ceb5988 100644
--- a/modules/config/default/+evil-bindings.el
+++ b/modules/config/default/+evil-bindings.el
@@ -61,13 +61,13 @@
       :i "C-j"           #'+default/newline    ; default behavior
 
       (:after help :map help-mode-map
-        :n "o"       #'ace-link-help)
+        :n "o"       #'link-hint-open-link)
       (:after helpful :map helpful-mode-map
-        :n "o"       #'ace-link-help)
+        :n "o"       #'link-hint-open-link)
       (:after info :map Info-mode-map
-        :n "o"       #'ace-link-info)
+        :n "o"       #'link-hint-open-link)
       (:after apropos :map apropos-mode-map
-        :n "o"       #'ace-link-help
+        :n "o"       #'link-hint-open-link
         :n "TAB"     #'forward-button
         :n [tab]     #'forward-button
         :n [backtab] #'backward-button)
@@ -583,7 +583,7 @@
         :desc "Search other directory"       "D" #'+default/search-other-cwd
         :desc "Locate file"                  "f" #'locate
         :desc "Jump to symbol"               "i" #'imenu
-        :desc "Jump to visible link"         "l" #'ace-link
+        :desc "Jump to visible link"         "l" #'link-hint-open-link
         :desc "Jump to link"                 "L" #'ffap-menu
         :desc "Jump list"                    "j" #'evil-show-jumps
         :desc "Jump to mark"                 "m" #'evil-show-marks
diff --git a/modules/config/default/config.el b/modules/config/default/config.el
index 6e2537375..f2e36c5b5 100644
--- a/modules/config/default/config.el
+++ b/modules/config/default/config.el
@@ -25,9 +25,7 @@
       avy-all-windows-alt t
       avy-background t
       ;; the unpredictability of this makes it a poor default
-      avy-single-candidate-jump nil
-      ;; Since `goto-address-mode' is enabled everywhere...
-      ace-link-fallback-function #'ace-link-addr)
+      avy-single-candidate-jump nil)
 
 
 (after! epa
@@ -67,7 +65,7 @@
   ;;   (sp-pair "{" nil :post-handlers '(:rem ("| " "SPC")))
   (after! smartparens
     ;; Smartparens is broken in `cc-mode' as of Emacs 27. See
-    ;; <https://github.com/Fuco1/smartparens/issues/963>.
+    ;; https://github.com/Fuco1/smartparens/issues/963.
     (unless EMACS27+
       (pushnew! sp--special-self-insert-commands 'c-electric-paren 'c-electric-brace))
 
diff --git a/modules/config/default/packages.el b/modules/config/default/packages.el
index 14a4de010..901090656 100644
--- a/modules/config/default/packages.el
+++ b/modules/config/default/packages.el
@@ -2,8 +2,8 @@
 ;;; config/default/packages.el
 
 (package! avy)
-(package! ace-link)
 (package! drag-stuff)
+(package! link-hint)
 
 (unless (featurep! :editor evil)
   (package! expand-region))