(ispell-grep-command): Use "grep" on MS-Windows and MS-DOS.

(ispell-grep-options): Use "-Ei" on MS-Windows and MS-DOS.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a2054ecbf0fc2a5065e9e4e5b70a04bcc13ca010..f8c6a93071556a6f69da48aa2dd68bd5a647e8c4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-29  Eli Zaretskii  <eliz@gnu.org>
+
+       * textmodes/ispell.el (ispell-grep-command): Use "grep" on
+       MS-Windows and MS-DOS.
+       (ispell-grep-options): Use "-Ei" on MS-Windows and MS-DOS.
+
 2007-12-28  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * progmodes/grep.el (rgrep): Fix last change.

diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 3d6a17c5d9334918114efa0577098af8bf5b9d57..c784960f9724ebb60cb955e6c34235525ef14ce9 100644 (file)
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -349,12 +349,17 @@ Always stores Fcc copy of message when nil."
   :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\""