From 11ee0977075d5c4ce77434acdacfc87f6fa1690c Mon Sep 17 00:00:00 2001
From: Dominik Schrempf <dominik.schrempf@gmail.com>
Date: Fri, 9 Aug 2019 16:24:32 +0200
Subject: [PATCH] Bugfix `spacemacs/avy-goto-url'.

- Use `avy-jump' instead of the deprecated `avy--generic-jump'.
- Add a keybinding to also open URLs (SPC j U).
---
 CHANGELOG.develop                               | 3 +++
 layers/+spacemacs/spacemacs-editing/packages.el | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.develop b/CHANGELOG.develop
index a27c9df73..54fac3b19 100644
--- a/CHANGELOG.develop
+++ b/CHANGELOG.develop
@@ -823,6 +823,7 @@ Other:
     - Font scaling ~SPC z x _~ scale down
     - Frame transparency ~SPC T T _~ decrease transparency
     - Zoom frame ~SPC z f _~ zoom frame out
+  - Added ~SPC j U~ for =spacemacs/avy-open-url= (thanks to Dominik Schrempf)
 - Improvements:
   - Rewrote window layout functions for ~SPC w 1~, ~SPC w 2~, ~SPC w 3~, and
     ~SPC w 4~ (thanks to Codruț Constantin Gușoi):
@@ -1048,6 +1049,8 @@ Other:
   - Required =ivy= to load =counsel-projectile= (thanks to Thanh Vuong)
   - Make =search-engine= layer support custom keywords for =engine-mode= (thanks to Maximilian Wolff)
   - Fixed =search-engine= layer customization issue (thanks to Haisheng Wu)
+  - Replaced deprecated =avy--generic-jump= with =avy-jump=
+    (thanks to Dominik Schrempf)
 *** Layer changes and fixes
 **** Agda
 - Fixes
diff --git a/layers/+spacemacs/spacemacs-editing/packages.el b/layers/+spacemacs/spacemacs-editing/packages.el
index ef91c453a..d3624a95b 100644
--- a/layers/+spacemacs/spacemacs-editing/packages.el
+++ b/layers/+spacemacs/spacemacs-editing/packages.el
@@ -65,6 +65,7 @@
         "jj" 'evil-avy-goto-char-timer
         "jl" 'evil-avy-goto-line
         "ju" 'spacemacs/avy-goto-url
+        "jU" 'spacemacs/avy-open-url
         "jw" 'evil-avy-goto-word-or-subword-1
         "xo" 'spacemacs/avy-open-url))
     :config
@@ -72,7 +73,7 @@
       (defun spacemacs/avy-goto-url()
         "Use avy to go to an URL in the buffer."
         (interactive)
-        (avy--generic-jump "https?://" nil 'pre))
+        (avy-jump "https?://"))
       (defun spacemacs/avy-open-url ()
         "Use avy to select an URL in the buffer and open it."
         (interactive)