From: Glenn Morris Date: Thu, 30 Jun 2011 03:03:07 +0000 (-0700) Subject: * lisp/find-dired.el (find-grep-options): Simplify. X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~323 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1d9b46d4ccbf41f347e8595aa75d55c52731ed60;p=emacs.git * lisp/find-dired.el (find-grep-options): Simplify. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 043e12e32e4..96f3b03406a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2011-06-30 Glenn Morris + * 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 a2b196dc029..491110bc898 100644 --- 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.