[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-27 f0da3aa 2/2: Merge branch 'emacs-27' of git.savannah.gnu.org:/s
From: |
Eli Zaretskii |
Subject: |
emacs-27 f0da3aa 2/2: Merge branch 'emacs-27' of git.savannah.gnu.org:/srv/git/emacs into emacs-27 |
Date: |
Fri, 27 Dec 2019 09:20:34 -0500 (EST) |
branch: emacs-27
commit f0da3aa83e010d3b5570ecbf2e0b396dd1aab91d
Merge: 3b19961 e1e0a7a
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Merge branch 'emacs-27' of git.savannah.gnu.org:/srv/git/emacs into emacs-27
---
lisp/progmodes/project.el | 2 +-
lisp/progmodes/xref.el | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index e21600f..d8909ac 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -485,7 +485,7 @@ pattern to search for."
(buffer-substring (point-min) (line-end-position))))
(while (re-search-forward grep-re nil t)
(push (list (string-to-number (match-string line-group))
- (concat remote-id (match-string file-group))
+ (match-string file-group)
(buffer-substring-no-properties (point)
(line-end-position)))
hits)))
(setq xrefs (xref--convert-hits (nreverse hits) regexp))
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 13a1600..bbd3940 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -1291,8 +1291,11 @@ Such as the current syntax table and the applied syntax
properties."
(defun xref--collect-matches (hit regexp tmp-buffer)
(pcase-let* ((`(,line ,file ,text) hit)
- (file (and file (concat (file-remote-p default-directory)
file)))
- (buf (xref--find-buffer-visiting file))
+ (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)))
(syntax-needed (xref--regexp-syntax-dependent-p regexp)))
(if buf
(with-current-buffer buf
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-27 f0da3aa 2/2: Merge branch 'emacs-27' of git.savannah.gnu.org:/srv/git/emacs into emacs-27,
Eli Zaretskii <=