branch: externals/ivy
commit 64a43fc05bb031d24e028f7eb1825d1b669e7d86
Merge: 8f8c900f1e 29b61fe1f4
Author: Basil L. Contovounesios <[email protected]>
Commit: Basil L. Contovounesios <[email protected]>
Merge branch 'master' into externals/ivy
---
ivy.el | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/ivy.el b/ivy.el
index d7a23fed96..9b66dac917 100644
--- a/ivy.el
+++ b/ivy.el
@@ -433,7 +433,9 @@ the restoring themselves.")
(end (region-end))
(eol (save-excursion (goto-char beg) (line-end-position))))
(buffer-substring-no-properties beg (min end eol))))
- ((thing-at-point 'url))
+ ((let ((url (thing-at-point 'url)))
+ ;; Work around `https://bugs.gnu.org/58091'.
+ (and (stringp url) url)))
((and (eq (ivy-state-collection ivy-last) #'read-file-name-internal)
(let ((inhibit-message t)
(ffap-machine-p-known 'reject))
