mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-03 10:31:37 -08:00
Code Issues Projects Releases Wiki Activity

; Fix xref--show-location, after regression in ee50e62

Browse source
This commit is contained in:
Dmitry Gutov 2015-08-10 04:30:33 +03:00
parent 6f9b233448
commit d39f33cf37
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lisp/progmodes/xref.el
View file

@ -430,16 +430,17 @@ Used for temporary buffers.")
(when (and restore (not (eq (car restore) 'same)))
(push (cons buf win) xref--display-history))))
(defun xref--display-position (pos other-window xref-buf)
(defun xref--display-position (pos other-window buf)
;; Show the location, but don't hijack focus.
(with-selected-window (display-buffer (current-buffer) other-window)
(xref--goto-char pos)
(run-hooks 'xref-after-jump-hook)
(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)))))
(let ((xref-buf (current-buffer)))
(with-selected-window (display-buffer buf other-window)
(xref--goto-char pos)
(run-hooks 'xref-after-jump-hook)
(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)
(condition-case err
@ -450,8 +451,8 @@ Used for temporary buffers.")
(unless (memq buf bl)
;; Newly created.
(add-hook 'buffer-list-update-hook #'xref--mark-selected nil t)
(push buf xref--temporary-buffers)))
(xref--display-position (point) t (current-buffer)))
(push buf xref--temporary-buffers))
(xref--display-position marker t buf)))
(user-error (message (error-message-string err)))))
(defun xref-show-location-at-point ()