From: Dmitry Gutov Date: Wed, 23 Feb 2022 01:53:05 +0000 (+0200) Subject: Unbreak project switcher when inside *xref* buffer X-Git-Tag: emacs-29.0.90~2149 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0f67a3df0ef161dde90454c48a7eb572ef406d1a;p=emacs.git Unbreak project switcher when inside *xref* buffer * lisp/progmodes/xref.el (xref--ensure-default-directory): New function. (xref--show-xref-buffer, xref-show-definitions-buffer-at-bottom): Use it (bug#53626). --- diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index 3374ab2e846..aa98aa89f15 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el @@ -1107,6 +1107,13 @@ Return an alist of the form ((GROUP . (XREF ...)) ...)." (cdr pair))) alist))) +(defun xref--ensure-default-directory (dd buffer) + ;; We might be in a let-binding which will restore the current value + ;; to a previous one (bug#53626). So do this later. + (run-with-timer + 0 nil + (lambda () (with-current-buffer buffer (setq default-directory dd))))) + (defun xref--show-xref-buffer (fetcher alist) (cl-assert (functionp fetcher)) (let* ((xrefs @@ -1117,7 +1124,7 @@ Return an alist of the form ((GROUP . (XREF ...)) ...)." (dd default-directory) buf) (with-current-buffer (get-buffer-create xref-buffer-name) - (setq default-directory dd) + (xref--ensure-default-directory dd (current-buffer)) (xref--xref-buffer-mode) (xref--show-common-initialize xref-alist fetcher alist) (pop-to-buffer (current-buffer)) @@ -1216,7 +1223,7 @@ local keymap that binds `RET' to `xref-quit-and-goto-xref'." (assoc-default 'display-action alist))) (t (with-current-buffer (get-buffer-create xref-buffer-name) - (setq default-directory dd) + (xref--ensure-default-directory dd (current-buffer)) (xref--transient-buffer-mode) (xref--show-common-initialize (xref--analyze xrefs) fetcher alist) (pop-to-buffer (current-buffer)