diff options
| -rw-r--r-- | lisp/progmodes/xref.el | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index c43f3a4ca83..b8ec50f14ae 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el @@ -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) |