diff options
| author | Glenn Morris <rgm@gnu.org> | 2019-12-30 09:04:04 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2019-12-30 09:04:04 -0800 |
| commit | a263ddea388ea40f59867f59b1ed6b522a78d54c (patch) | |
| tree | 8ca365a3a4b1d919d4011fae929b8b818612e61c /lisp/progmodes | |
| parent | e1fd6b1107179270b6daeab52053ffb2461531a9 (diff) | |
| parent | 8224ed7d406e8654a163b05c0c647a5d44c090ed (diff) | |
| download | emacs-a263ddea388ea40f59867f59b1ed6b522a78d54c.tar.gz emacs-a263ddea388ea40f59867f59b1ed6b522a78d54c.tar.bz2 emacs-a263ddea388ea40f59867f59b1ed6b522a78d54c.zip | |
Merge from origin/emacs-27
8224ed7d40 (xref--find-buffer-visiting): Speed up by using get-file-b...
Diffstat (limited to 'lisp/progmodes')
| -rw-r--r-- | lisp/progmodes/xref.el | 6 |
1 files changed, 2 insertions, 4 deletions
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) |