[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 3aa8f4d: In xref-location-marker, handle deleted fi
From: |
Stephen Leake |
Subject: |
[Emacs-diffs] master 3aa8f4d: In xref-location-marker, handle deleted file or outdated xref location nicely |
Date: |
Sun, 20 Oct 2019 09:39:20 -0400 (EDT) |
branch: master
commit 3aa8f4d44c33d71b815e4e94c02d5ec13cfd6372
Author: Stephen Leake <address@hidden>
Commit: Stephen Leake <address@hidden>
In xref-location-marker, handle deleted file or outdated xref location
nicely
* lisp/progmodes/xref.el (xref-location-marker): Add ignore-errors.
---
lisp/progmodes/xref.el | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 702de89..8d8e7ab 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -131,8 +131,13 @@ Line numbers start from 1 and columns from 0.")
(widen)
(save-excursion
(goto-char (point-min))
- (beginning-of-line line)
- (forward-char column)
+ (ignore-errors
+ ;; xref location may be out of date; it may be past the
+ ;; end of the current file, or the file may have been
+ ;; deleted. Return a reasonable location; the user will
+ ;; figure it out.
+ (beginning-of-line line)
+ (forward-char column))
(point-marker))))))
(cl-defmethod xref-location-group ((l xref-file-location))
- [Emacs-diffs] master 3aa8f4d: In xref-location-marker, handle deleted file or outdated xref location nicely,
Stephen Leake <=