summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ffap.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ffap.el b/lisp/ffap.el
index 36727b3747..8343b475c1 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -1966,7 +1966,9 @@ Only intended for interactive use."
(defun ffap-guess-file-name-at-point ()
"Try to get a file name at point.
This hook is intended to be put in `file-name-at-point-functions'."
- (let ((guess (ffap-guesser)))
+ ;; ffap-guesser can signal an error, and we don't want that when,
+ ;; e.g., the user types M-n at the "C-x C-f" prompt.
+ (let ((guess (ignore-errors (ffap-guesser))))
(when (stringp guess)
(let ((url (ffap-url-p guess)))
(or url