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

lisp/ChangeLog

 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.

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.