[Emacs-diffs] /srv/bzr/emacs/trunk r105832: * lisp/progmodes/grep.el (grep-process-setup): Don't check code for 1

[Juri Linkov]

------------------------------------------------------------
revno: 105832
fixes bug(s): http://debbugs.gnu.org/9226
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Sun 2011-09-18 23:20:08 +0300
message:
  * lisp/progmodes/grep.el (grep-process-setup): Don't check code for 1
  because `zgrep' returns 1 for successful matches.
modified:
  lisp/ChangeLog
  lisp/progmodes/grep.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-18 20:14:16 +0000
+++ b/lisp/ChangeLog    2011-09-18 20:20:08 +0000
@@ -1,5 +1,10 @@
 2011-09-18  Juri Linkov  <address@hidden>
 
+       * 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  <address@hidden>
+
        * 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

=== modified file 'lisp/progmodes/grep.el'
--- a/lisp/progmodes/grep.el    2011-09-08 12:07:52 +0000
+++ b/lisp/progmodes/grep.el    2011-09-18 20:20:08 +0000
@@ -476,7 +476,7 @@
             ;; 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)))