From: Oleh Krehel <ohwoeowho@gmail.com>
Date: Mon, 4 Apr 2016 14:58:05 +0000 (+0200)
Subject: ivy.el: Improve "M-n"
X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/8de29309890329c7f7a150bdcfc2b664f2f8b1fe

ivy.el: Improve "M-n"

Now uses `ffap-file-at-point' only for 'read-file-name-internal.
---

diff --git a/ivy.el b/ivy.el
index 4f46ae451..86021d617 100644
--- a/ivy.el
+++ b/ivy.el
@@ -305,7 +305,8 @@ This should eventually become a stack so that you could use
   "Return a string that corresponds to the current thing at point."
   (or
    (thing-at-point 'url)
-   (ffap-file-at-point)
+   (and (eq (ivy-state-collection ivy-last) 'read-file-name-internal)
+        (ffap-file-at-point))
    (let (s)
      (cond ((stringp (setq s (thing-at-point 'symbol)))
             (if (string-match "\\`[`']?\\(.*?\\)'?\\'" s)