From 9592a014df784e67a4647d5b6424f2758dfaad3c Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Mon, 19 Jan 2015 05:29:37 +0200 Subject: [PATCH] xref: Use other-window-scroll-buffer and user-error * lisp/progmodes/xref.el (xref--display-position): Set `other-window-scroll-buffer'. (xref-goto-xref): Use `user-error'. --- lisp/ChangeLog | 6 ++++++ lisp/progmodes/xref.el | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 39d9436b3f1..3991885d2ec 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-01-19 Dmitry Gutov + + * progmodes/xref.el (xref--display-position): + Set `other-window-scroll-buffer'. + (xref-goto-xref): Use `user-error'. + 2015-01-19 Dmitry Gutov * progmodes/xref.el (xref--display-history): New variable. diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index 4431cb5d3b3..12123c8f2e2 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el @@ -352,6 +352,7 @@ WINDOW controls how the buffer is displayed: (let ((buf (current-buffer)) (win (selected-window))) (with-current-buffer xref-buf + (setq-local other-window-scroll-buffer buf) (xref--save-to-history buf win))))) (defun xref--show-location (location) @@ -390,7 +391,7 @@ WINDOW controls how the buffer is displayed: (interactive) (back-to-indentation) (let ((loc (or (xref--location-at-point) - (error "No reference at point"))) + (user-error "No reference at point"))) (window xref--window)) (xref--quit) (xref--pop-to-location loc window))) -- 2.39.5