2 files changed, 7 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 099da8d1dc5..fd3907897d5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2001-09-02  Eli Zaretskii  <eliz@is.elta.co.il>
 
+        * progmodes/cmacexp.el (c-macro-preprocessor): Use "gcc -E" for
+        MS-DOS, since cpp might not be available.
+
         * menu-bar.el (menu-bar-edit-menu) <yank-menu, yank>: Mention
         "yank" in the help-echo text.  Suggested by Pavel Jan,Bm(Bk
         <Pavel@Janik.cz>.
diff --git a/lisp/progmodes/cmacexp.el b/lisp/progmodes/cmacexp.el
index a701da6e808..a42df869dfd 100644
--- a/lisp/progmodes/cmacexp.el
+++ b/lisp/progmodes/cmacexp.el
@@ -108,8 +108,10 @@
   :group 'c-macro)
 
 (defcustom c-macro-preprocessor
-  ;; Cannot rely on standard directory on MS-DOS to find CPP.
-  (cond ((eq system-type 'ms-dos) "cpp -C")
+  ;; Cannot rely on standard directory on MS-DOS to find CPP.  In
+  ;; fact, cannot rely on having cpp.exe, either, in latest GCC
+  ;; versions.
+  (cond ((eq system-type 'ms-dos) "gcc -E -C -o - -")
         ;; Solaris has it in an unusual place.
         ((and (string-match "^[^-]*-[^-]*-\\(solaris\\|sunos5\\)"
                             system-configuration)