diff options
| author | Dmitry Gutov <dgutov@yandex.ru> | 2021-06-07 04:52:30 +0300 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2021-06-07 04:52:30 +0300 |
| commit | 45bdc37c8127142504f5f93bcb1327a635f6da1b (patch) | |
| tree | a5a1f1b084f09f7d48a08da9bd8cfb1f3650b6af /lisp/cedet/semantic/symref/grep.el | |
| parent | 6329e70460137e34abbc7590c5892623547f9b26 (diff) | |
| download | emacs-45bdc37c8127142504f5f93bcb1327a635f6da1b.tar.gz | |
Support old BSD find and "root dir symlink" better
* lisp/progmodes/grep.el (grep-compute-defaults):
Add '-H' to grep-find-template (bug#48471).
* lisp/cedet/semantic/symref/grep.el (semantic-symref-perform-search):
Pass the root directory name without the trailing slash.
* lisp/progmodes/xref.el (xref-matches-in-directory): Ditto.
* test/lisp/progmodes/xref-tests.el (xref--xref-file-name-display-is-abs)
(xref--xref-file-name-display-is-relative-to-project-root):
Make tests more strict again.
Diffstat (limited to 'lisp/cedet/semantic/symref/grep.el')
| -rw-r--r-- | lisp/cedet/semantic/symref/grep.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/cedet/semantic/symref/grep.el b/lisp/cedet/semantic/symref/grep.el index 46027f1f91e..180d779a780 100644 --- a/lisp/cedet/semantic/symref/grep.el +++ b/lisp/cedet/semantic/symref/grep.el @@ -168,7 +168,7 @@ This shell should support pipe redirect syntax." (erase-buffer) (setq default-directory rootdir) (let ((cmd (semantic-symref-grep-use-template - (file-name-as-directory (file-local-name rootdir)) + (directory-file-name (file-local-name rootdir)) filepattern grepflags greppat))) (process-file semantic-symref-grep-shell nil b nil shell-command-switch cmd))) |