[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 7ad1d07: Avoid signaling errors in 'M-n' at the '
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-25 7ad1d07: Avoid signaling errors in 'M-n' at the 'C-x C-f' prompt |
Date: |
Fri, 08 Apr 2016 08:06:33 +0000 |
branch: emacs-25
commit 7ad1d075b940f276adaf3b6bb0c024079c403f80
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
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)
---
lisp/ffap.el | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/lisp/ffap.el b/lisp/ffap.el
index 36727b3..8343b47 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 7ad1d07: Avoid signaling errors in 'M-n' at the 'C-x C-f' prompt,
Eli Zaretskii <=