diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2016-04-08 11:05:20 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2016-04-08 11:05:20 +0300 |
| commit | 7ad1d075b940f276adaf3b6bb0c024079c403f80 (patch) | |
| tree | 33acb23746af466e98c360b8f87297be260e34f0 /lisp/ffap.el | |
| parent | a3f1ac2e3b546951f3182a7b42cad7f64a94e0b8 (diff) | |
| download | emacs-7ad1d075b940f276adaf3b6bb0c024079c403f80.tar.gz | |
Avoid signaling errors in 'M-n' at the 'C-x C-f' prompt
* lisp/ffap.el (ffap-guess-file-name-at-point): Ignore errors
while 'ffap-guesser' runs. (Bug#23218)
Diffstat (limited to 'lisp/ffap.el')
| -rw-r--r-- | lisp/ffap.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ffap.el b/lisp/ffap.el index 36727b3747d..8343b475c1b 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 |