* lisp/find-dired.el (find-grep-options): Simplify.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 043e12e32e4690829258fbc9fd05c674330ecef9..96f3b03406a7231c8f9e823b44b47202ac644786 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2011-06-30  Glenn Morris  <rgm@gnu.org>
 
+       * find-dired.el (find-grep-options): Simplify.
+
        * term/ns-win.el (ns-set-resource): Declare.
 
        * ses.el (row, col): Declare dynamic variables honestly.

diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index a2b196dc0292dcb6f0e25dd66857407c2acda799..491110bc898521243e5c57c40d1dcd05dad11ed5 100644 (file)
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -86,8 +86,7 @@ them for `find-ls-option'."
 
 (defcustom find-grep-options
   (if (or (eq system-type 'berkeley-unix)
-         (string-match "solaris2" system-configuration)
-         (string-match "irix" system-configuration))
+         (string-match "solaris2\\|irix" system-configuration))
       "-s" "-q")
   "Option to grep to be as silent as possible.
 On Berkeley systems, this is `-s'; on Posix, and with GNU grep, `-q' does it.