diff options
| author | Juri Linkov <juri@jurta.org> | 2011-09-18 23:20:08 +0300 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2011-09-18 23:20:08 +0300 |
| commit | 46c5cf6650c166aca02bc2305d0c4e2784e1de3a (patch) | |
| tree | e85609f51f80ef4e6704297c0e60ab7e914cd226 | |
| parent | d18b513ba78f152ca7c45cf04153c6868972e45e (diff) | |
| download | emacs-46c5cf6650c166aca02bc2305d0c4e2784e1de3a.tar.gz | |
* lisp/progmodes/grep.el (grep-process-setup): Don't check code for 1
because `zgrep' returns 1 for successful matches.
Fixes: debbugs:9226
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/grep.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b820fc24d51..c8e9faa3a2b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,10 @@ 2011-09-18 Juri Linkov <juri@jurta.org> + * progmodes/grep.el (grep-process-setup): Don't check code for 1 + because `zgrep' returns 1 for successful matches (bug#9226). + +2011-09-18 Juri Linkov <juri@jurta.org> + * info.el (Info-extract-menu-node-name): Check the second match for empty string (second test-case of bug#9528). (Info-last-preorder): Let-bind `Info-history' to nil to not add diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index 000243b05df..2c68a29dd00 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el @@ -476,7 +476,7 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'." ;; so the buffer is still unmodified if there is no output. (cond ((and (zerop code) (buffer-modified-p)) '("finished (matches found)\n" . "matched")) - ((or (= code 1) (not (buffer-modified-p))) + ((not (buffer-modified-p)) '("finished with no matches found\n" . "no match")) (t (cons msg code))) |