diff options
author | Dmitry Gutov <dgutov@yandex.ru> | 2017-05-29 02:55:42 +0300 |
---|---|---|
committer | Dmitry Gutov <dgutov@yandex.ru> | 2017-05-29 02:55:58 +0300 |
commit | 3bc3dc406343bd7e50acae7c0f9d5f8cc89420cd (patch) | |
tree | 8cf9847349e655db0f09a38f6141830ce9ec609c /lisp/progmodes/xref.el | |
parent | d76c0078986b72bd83741f16f4db83c1b31de520 (diff) | |
download | emacs-3bc3dc406343bd7e50acae7c0f9d5f8cc89420cd.tar.gz |
Signal error if find-grep returns a nonzero status
* lisp/progmodes/xref.el (xref-collect-matches): Signal error
if find-grep returns a nonzero status (bug#23451). Remove the
comment: even if some output is present, a non-zero status
means something went wrong and it can't be relied upon.
Diffstat (limited to 'lisp/progmodes/xref.el')
-rw-r--r-- | lisp/progmodes/xref.el | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index 9b6a560971c..c43f3a4ca83 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el @@ -929,14 +929,16 @@ IGNORES is a list of glob patterns." ignores)) (buf (get-buffer-create " *xref-grep*")) (grep-re (caar grep-regexp-alist)) + status hits) (with-current-buffer buf (erase-buffer) - (call-process-shell-command command nil t) - ;; FIXME: What to do when the call fails? - ;; "find: ‘xyzgrep’: No such file or directory\n" - ;; The problem is, find-grep can exit with a nonzero code even - ;; when there are some matches in the output. + (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)) (while (re-search-forward grep-re nil t) (push (list (string-to-number (match-string 2)) |