procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use regexp matching instead of checking exit status

Browse source 
* lisp/progmodes/xref.el (xref-collect-matches):
See if the output buffer contents look like Grep output
instead of checking exit status (bug#23451).
This commit is contained in:
Dmitry Gutov 2017-05-30 00:58:39 +03:00
parent 299a96c7f6
commit 4886b2ed52
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lisp/progmodes/xref.el
View file

@ -935,11 +935,14 @@ IGNORES is a list of glob patterns."
(erase-buffer)
(setq status
(call-process-shell-command command nil t))
(when (and (not (zerop status))
;; Nonzero status can mean "no matches found".
(/= (point-min) (point-max)))
(user-error "Search failed with status %d: %s" status (buffer-string)))
(goto-char (point-min))
;; Can't use the exit status: Grep exits with 1 to mean "no
;; matches found". Find exits with 1 if any of the invocations
;; exit with non-zero. "No matches" and "Grep program not found"
;; are all the same to it.
(when (and (/= (point-min) (point-max))
(not (looking-at grep-re)))
(user-error "Search failed with status %d: %s" status (buffer-string)))
(while (re-search-forward grep-re nil t)
(push (list (string-to-number (match-string 2))
(match-string 1)