Romain Francoise's and Ami Fischman's bugfixes.

[gnu-emacs] / lisp / progmodes / cmacexp.el

diff --git a/lisp/progmodes/cmacexp.el b/lisp/progmodes/cmacexp.el
index bc3a1b584d308da6b3470b62035013ed68817e41..27fe81e451d6d7ce81290bdb0b3326d8dbccab40 100644 (file)
--- a/lisp/progmodes/cmacexp.el
+++ b/lisp/progmodes/cmacexp.el
@@ -1,8 +1,8 @@
 ;;; cmacexp.el --- expand C macros in a region
 
-;; Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1994, 1996, 2000 Free Software Foundation, Inc.
 
-;; Author: Francesco Potorti` <pot@cnuce.cnr.it>
+;; Author: Francesco Potorti` <pot@gnu.org>
 ;; Adapted-By: ESR
 ;; Keywords: c
 
@@ -23,6 +23,8 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;; USAGE =============================================================
 
 ;; In C mode C-C C-e is bound to c-macro-expand.  The result of the
@@ -62,7 +64,7 @@
 ;; BUG REPORTS =======================================================
 
 ;; Please report bugs, suggestions, complaints and so on to
-;; pot@cnuce.cnr.it (Francesco Potorti`).
+;; pot@gnu.org (Francesco Potorti`).
 
 ;; IMPROVEMENTS OVER emacs 18.xx cmacexp.el ==========================
 
@@ -84,6 +86,7 @@
 ;; If the start point of the region is inside a macro definition the
 ;; macro expansion is often inaccurate.
 
+;;; Code:
 
 (require 'cc-mode)
 
@@ -105,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)
@@ -382,4 +387,5 @@ Optional arg DISPLAY non-nil means show messages in the echo area."
       ;; Cleanup.
       (kill-buffer outbuf))))
 
+;;; arch-tag: 4f20253c-71ef-4e6d-a774-19087060910e
 ;;; cmacexp.el ends here