aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2011-09-18 23:20:08 +0300
committerJuri Linkov2011-09-18 23:20:08 +0300
commit46c5cf6650c166aca02bc2305d0c4e2784e1de3a (patch)
treee85609f51f80ef4e6704297c0e60ab7e914cd226
parentd18b513ba78f152ca7c45cf04153c6868972e45e (diff)
downloademacs-46c5cf6650c166aca02bc2305d0c4e2784e1de3a.tar.gz
emacs-46c5cf6650c166aca02bc2305d0c4e2784e1de3a.zip
* 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/ChangeLog5
-rw-r--r--lisp/progmodes/grep.el2
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 @@
12011-09-18 Juri Linkov <juri@jurta.org> 12011-09-18 Juri Linkov <juri@jurta.org>
2 2
3 * progmodes/grep.el (grep-process-setup): Don't check code for 1
4 because `zgrep' returns 1 for successful matches (bug#9226).
5
62011-09-18 Juri Linkov <juri@jurta.org>
7
3 * info.el (Info-extract-menu-node-name): Check the second match 8 * info.el (Info-extract-menu-node-name): Check the second match
4 for empty string (second test-case of bug#9528). 9 for empty string (second test-case of bug#9528).
5 (Info-last-preorder): Let-bind `Info-history' to nil to not add 10 (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'."
476 ;; so the buffer is still unmodified if there is no output. 476 ;; so the buffer is still unmodified if there is no output.
477 (cond ((and (zerop code) (buffer-modified-p)) 477 (cond ((and (zerop code) (buffer-modified-p))
478 '("finished (matches found)\n" . "matched")) 478 '("finished (matches found)\n" . "matched"))
479 ((or (= code 1) (not (buffer-modified-p))) 479 ((not (buffer-modified-p))
480 '("finished with no matches found\n" . "no match")) 480 '("finished with no matches found\n" . "no match"))
481 (t 481 (t
482 (cons msg code))) 482 (cons msg code)))