[Emacs-diffs] /srv/bzr/emacs/trunk r104800: * lisp/find-dired.el (find-grep-options): Simplify.

[Glenn Morris]

------------------------------------------------------------
revno: 104800
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2011-06-29 20:03:07 -0700
message:
  * lisp/find-dired.el (find-grep-options): Simplify.
modified:
  lisp/ChangeLog
  lisp/find-dired.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-06-30 02:54:16 +0000
+++ b/lisp/ChangeLog    2011-06-30 03:03:07 +0000
@@ -1,5 +1,7 @@
 2011-06-30  Glenn Morris  <address@hidden>
 
+       * find-dired.el (find-grep-options): Simplify.
+
        * term/ns-win.el (ns-set-resource): Declare.
 
        * ses.el (row, col): Declare dynamic variables honestly.

=== modified file 'lisp/find-dired.el'
--- a/lisp/find-dired.el        2011-04-02 20:36:47 +0000
+++ b/lisp/find-dired.el        2011-06-30 03:03:07 +0000
@@ -86,8 +86,7 @@
 
 (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.