From: Dmitry Gutov Date: Fri, 27 Dec 2019 16:17:48 +0000 (+0300) Subject: (xref--find-buffer-visiting): Speed up by using get-file-buffer X-Git-Tag: emacs-27.0.90~269 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8224ed7d40;p=emacs.git (xref--find-buffer-visiting): Speed up by using get-file-buffer * lisp/progmodes/xref.el (xref--find-buffer-visiting): Speed up by using get-file-buffer. (xref--collect-matches): Remove the condition on remote-id. (https://lists.gnu.org/archive/html/emacs-devel/2019-12/msg00753.html) --- diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index bbd3940be4f..12f32b1cdf6 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el @@ -1293,9 +1293,7 @@ Such as the current syntax table and the applied syntax properties." (pcase-let* ((`(,line ,file ,text) hit) (remote-id (file-remote-p default-directory)) (file (and file (concat remote-id file))) - (buf (unless remote-id - ;; find-buffer-visiting is slow on remote. - (xref--find-buffer-visiting file))) + (buf (xref--find-buffer-visiting file)) (syntax-needed (xref--regexp-syntax-dependent-p regexp))) (if buf (with-current-buffer buf @@ -1354,7 +1352,7 @@ Such as the current syntax table and the applied syntax properties." (defun xref--find-buffer-visiting (file) (unless (equal (car xref--last-visiting-buffer) file) (setq xref--last-visiting-buffer - (cons file (find-buffer-visiting file)))) + (cons file (get-file-buffer file)))) (cdr xref--last-visiting-buffer)) (provide 'xref)