(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 a701da6e808f11d258ea966346cc2674e72bd9e4..65eea658d4ee029a5444dcab3f599ee505a041fa 100644 (file)
--- a/lisp/progmodes/cmacexp.el
+++ b/lisp/progmodes/cmacexp.el
@@ -108,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)
@@ -385,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