From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Sat, 14 Nov 2015 21:13:12 +0000 (+0000)
Subject: * lisp/progmodes/xref.el (xref-pop-marker-stack): Downgrade errors
X-Git-Tag: emacs-25.0.90~792
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d24e7833e56eb9ce8731975518da0c7fda3d00f2;p=emacs.git

* lisp/progmodes/xref.el (xref-pop-marker-stack): Downgrade errors

Signal user-errors instead.
---

diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 6a3b42ff646..1962614f16d 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -345,10 +345,10 @@ elements is negated."
   (interactive)
   (let ((ring xref--marker-ring))
     (when (ring-empty-p ring)
-      (error "Marker stack is empty"))
+      (user-error "Marker stack is empty"))
     (let ((marker (ring-remove ring 0)))
       (switch-to-buffer (or (marker-buffer marker)
-                            (error "The marked buffer has been deleted")))
+                            (user-error "The marked buffer has been deleted")))
       (goto-char (marker-position marker))
       (set-marker marker nil nil)
       (run-hooks 'xref-after-return-hook))))