Mercurial > emacs

diff lisp/textmodes/ispell.el @ 87519:6a0c500ca3a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--rel--22, gnus--devo--0 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-975
author Miles Bader <miles@gnu.org>
date Wed, 02 Jan 2008 02:20:42 +0000
parents 20bb7aaa7b12 e1264c5f9e23
children 107ccd98fa12 c938ab6810a4
line wrap: on
line diff
--- a/lisp/textmodes/ispell.el	Wed Jan 02 00:42:37 2008 +0000
+++ b/lisp/textmodes/ispell.el	Wed Jan 02 02:20:42 2008 +0000
@@ -336,12 +336,17 @@
   :group 'ispell)
 
 
-(defcustom ispell-grep-command "egrep"
+(defcustom ispell-grep-command
+  ;; MS-Windows/MS-DOS have `egrep' as a Unix shell script, so they
+  ;; cannot invoke it.  Use "grep -E" instead (see ispell-grep-options
+  ;; below).
+  (if (memq system-type '(windows-nt ms-dos)) "grep" "egrep")
   "Name of the grep command for search processes."
   :type 'string
   :group 'ispell)
 
-(defcustom ispell-grep-options "-i"
+(defcustom ispell-grep-options
+  (if (memq system-type '(windows-nt ms-dos)) "-Ei" "-i")
   "String of options to use when running the program in `ispell-grep-command'.
 Should probably be \"-i\" or \"-e\".
 Some machines (like the NeXT) don't support \"-i\""