summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2007-12-29 12:41:44 +0000
committerEli Zaretskii <eliz@gnu.org>2007-12-29 12:41:44 +0000
commit6a314a29a4802be2655c756cbbd8edfdb0dda89e (patch)
tree7ede68bb47c80d25b2759c27bbb898bfdbcb906d
parent1bb9cd964636f4eaa02b2f182aeb375cf41b05f2 (diff)
downloademacs-6a314a29a4802be2655c756cbbd8edfdb0dda89e.tar.gz
(ispell-grep-command): Use "grep" on MS-Windows and MS-DOS.
(ispell-grep-options): Use "-Ei" on MS-Windows and MS-DOS.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/textmodes/ispell.el9
2 files changed, 13 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a2054ecbf0f..f8c6a930715 100644
--- 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 3d6a17c5d93..c784960f972 100644
--- 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\""