[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#33870: 27.0.50; xref-goto-xref not configurable
From: |
Juri Linkov |
Subject: |
bug#33870: 27.0.50; xref-goto-xref not configurable |
Date: |
Sun, 27 Jan 2019 22:29:43 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (x86_64-pc-linux-gnu) |
>> If only that patch were able to keep the current behavior by default.
>
> Yep. If Juri provides a simpler patch that does this I'm all for it.
Ok, here's 100% backward-compatible patch:
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 87ce2299c5..9522d7e475 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -474,27 +474,17 @@ xref--show-pos-in-buf
(or (eq xref--original-window-intent 'frame)
pop-up-frames))
(action
- (cond ((memq
- xref--original-window-intent
- '(window frame))
+ (cond ((eq xref--original-window-intent 'frame)
t)
+ ((eq xref--original-window-intent 'window)
+ '(display-buffer-same-window))
((and
(window-live-p xref--original-window)
(or (not (window-dedicated-p xref--original-window))
(eq (window-buffer xref--original-window) buf)))
- `(,(lambda (buf _alist)
- (set-window-buffer xref--original-window buf)
- xref--original-window))))))
- (with-selected-window
- (with-selected-window
- ;; Just before `display-buffer', place ourselves in the
- ;; original window to suggest preserving it. Of course, if
- ;; user has deleted the original window, all bets are off,
- ;; just use the selected one.
- (or (and (window-live-p xref--original-window)
- xref--original-window)
- (selected-window))
- (display-buffer buf action))
+ `((display-buffer-in-previous-window)
+ (previous-window . ,xref--original-window))))))
+ (with-selected-window (display-buffer buf action)
(xref--goto-char pos)
(run-hooks 'xref-after-jump-hook)
(let ((buf (current-buffer)))
- bug#33870: 27.0.50; xref-goto-xref not configurable, (continued)
- bug#33870: 27.0.50; xref-goto-xref not configurable, Dmitry Gutov, 2019/01/21
- bug#33870: 27.0.50; xref-goto-xref not configurable, Dmitry Gutov, 2019/01/17
- bug#33870: 27.0.50; xref-goto-xref not configurable, João Távora, 2019/01/18
- bug#33870: 27.0.50; xref-goto-xref not configurable, Dmitry Gutov, 2019/01/18
- bug#33870: 27.0.50; xref-goto-xref not configurable, João Távora, 2019/01/18
- bug#33870: 27.0.50; xref-goto-xref not configurable, martin rudalics, 2019/01/18
- bug#33870: 27.0.50; xref-goto-xref not configurable, Dmitry Gutov, 2019/01/18
- bug#33870: 27.0.50; xref-goto-xref not configurable, Juri Linkov, 2019/01/19
- bug#33870: 27.0.50; xref-goto-xref not configurable, Dmitry Gutov, 2019/01/19
- bug#33870: 27.0.50; xref-goto-xref not configurable, João Távora, 2019/01/19
- bug#33870: 27.0.50; xref-goto-xref not configurable,
Juri Linkov <=
- bug#33870: 27.0.50; xref-goto-xref not configurable, João Távora, 2019/01/31
- bug#33870: 27.0.50; xref-goto-xref not configurable, João Távora, 2019/01/31
- bug#33870: 27.0.50; xref-goto-xref not configurable, Dmitry Gutov, 2019/01/31