(ebrowse-revert-tree-buffer-from-file): Use with-no-warnings.

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

diff --git a/lisp/progmodes/cmacexp.el b/lisp/progmodes/cmacexp.el
index 96aef6ad9d2edc9c2cdbc8f0641a3270b860030a..65eea658d4ee029a5444dcab3f599ee505a041fa 100644 (file)
--- a/lisp/progmodes/cmacexp.el
+++ b/lisp/progmodes/cmacexp.el
@@ -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
@@ -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,15 +108,23 @@
   :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")
-       ;; Solaris has it in an unusual place.
+  (cond ;; Solaris has it in an unusual place.
        ((and (string-match "^[^-]*-[^-]*-\\(solaris\\|sunos5\\)"
                            system-configuration)
              (file-exists-p "/opt/SUNWspro/SC3.0.1/bin/acomp"))
         "/opt/SUNWspro/SC3.0.1/bin/acomp -C -E")
-        ((file-exists-p "/usr/ccs/lib/cpp") "/usr/ccs/lib/cpp -C")
-       (t "/lib/cpp -C"))
+        ((locate-file "/usr/ccs/lib/cpp"
+                     '("/") exec-suffixes 'file-executable-p)
+        "/usr/ccs/lib/cpp -C")
+       ((locate-file "/lib/cpp"
+                     '("/") exec-suffixes 'file-executable-p)
+        "/lib/cpp -C")
+       ;; On some systems, we cannot rely on standard directories to
+       ;; find CPP.  In fact, we cannot rely on having cpp, either,
+       ;; in some GCC versions.
+       ((locate-file "cpp" exec-path exec-suffixes 'file-executable-p)
+        "cpp -C")
+       (t "gcc -E -C -o - -"))
   "The preprocessor used by the cmacexp package.
 
 If you change this, be sure to preserve the `-C' (don't strip comments)
@@ -382,4 +393,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