When compiling, require compare-w and skeleton

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

diff --git a/lisp/progmodes/cmacexp.el b/lisp/progmodes/cmacexp.el
index 168dcc9f623d3c6bd5cd6be4969a35dfae0fbaa0..82d90d6d5999cd71da372676b35496751a511dd6 100644 (file)
--- a/lisp/progmodes/cmacexp.el
+++ b/lisp/progmodes/cmacexp.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc.
 
 ;; Author: Francesco Potorti` <pot@cnuce.cnr.it>
-;; Version: $Id: cmacexp.el,v 1.22 1996/01/29 05:26:21 rms Exp rms $
 ;; Adapted-By: ESR
 ;; Keywords: c
 
@@ -90,25 +89,45 @@
 
 (provide 'cmacexp)
 
-(defvar c-macro-shrink-window-flag nil
-  "*Non-nil means shrink the *Macroexpansion* window to fit its contents.")
+(defgroup c-macro nil
+  "Expand C macros in a region."
+  :group 'c)
 
-(defvar c-macro-prompt-flag nil
-  "*Non-nil makes `c-macro-expand' prompt for preprocessor arguments.")
 
-(defvar c-macro-preprocessor
+(defcustom c-macro-shrink-window-flag nil
+  "*Non-nil means shrink the *Macroexpansion* window to fit its contents."
+  :type 'boolean
+  :group 'c-macro)
+
+(defcustom c-macro-prompt-flag nil
+  "*Non-nil makes `c-macro-expand' prompt for preprocessor arguments."
+  :type 'boolean
+  :group 'c-macro)
+
+(defcustom c-macro-preprocessor
   ;; Cannot rely on standard directory on MS-DOS to find CPP.
-  (if (eq system-type 'ms-dos) "cpp -C" "/lib/cpp -C")
+  (cond ((eq system-type 'ms-dos) "cpp -C")
+       ;; 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")
+       (t "/lib/cpp -C"))
   "The preprocessor used by the cmacexp package.
 
 If you change this, be sure to preserve the `-C' (don't strip comments)
-option, or to set an equivalent one.")
+option, or to set an equivalent one."
+  :type 'string
+  :group 'c-macro)
 
-(defvar c-macro-cppflags ""
-  "*Preprocessor flags used by `c-macro-expand'.")
+(defcustom c-macro-cppflags ""
+  "*Preprocessor flags used by `c-macro-expand'."
+  :type 'string
+  :group 'c-macro)
 
 (defconst c-macro-buffer-name "*Macroexpansion*")
 
+;;;###autoload
 (defun c-macro-expand (start end subst)
   "Expand C macros in the region, using the C preprocessor.
 Normally display output in temp buffer, but
@@ -202,7 +221,7 @@ For use inside Lisp programs, see also `c-macro-expansion'."
            (setq minheight (if alreadythere
                                (window-height)
                              window-min-height))
-           (setq maxheight (/ (screen-height) 2))
+           (setq maxheight (/ (frame-height) 2))
            (enlarge-window (- (min maxheight
                                    (max minheight
                                         (+ 2 (vertical-motion (point-max)))))
@@ -240,28 +259,30 @@ Optional arg DISPLAY non-nil means show messages in the echo area."
                       c-macro-preprocessor
                       (if (string= "" c-macro-cppflags) "" " ")
                       c-macro-cppflags))
-       (uniquestring "???!!!???!!! start of c-macro expansion ???!!!???!!!")
+       (uniquestring "??? !!! ??? start of c-macro expansion ??? !!! ???")
        (startlinenum 0)
        (linenum 0)
        (startstat ())
        (startmarker "")
        (exit-status 0)
-       (tempname (make-temp-name (or (getenv "TMPDIR") (getenv "TEMP")
-                                     (getenv "TMP") "/tmp/"))))
+       (tempname (make-temp-name
+                  (expand-file-name "cmacexp"
+                                    temporary-file-directory))))
     (unwind-protect
        (save-excursion
          (save-restriction
            (widen)
-           (set-buffer outbuf)
-           (setq buffer-read-only nil)
-           (erase-buffer)
-           (set-syntax-table c-mode-syntax-table)
+            (let ((in-syntax-table (syntax-table)))
+              (set-buffer outbuf)
+              (setq buffer-read-only nil)
+              (erase-buffer)
+              (set-syntax-table in-syntax-table))
            (insert-buffer-substring inbuf 1 end))
 
          ;; We have copied inbuf to outbuf.  Point is at end of
-         ;; outbuf.  Insert a space at the end, so cpp can correctly
-         ;; parse a token ending at END. 
-         (insert " ")
+         ;; outbuf.  Inset a newline at the end, so cpp can correctly
+         ;; parse a token ending at END.
+          (insert "\n")
 
          ;; Save sexp status and line number at START.
          (setq startstat (parse-partial-sexp 1 start))