aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes
diff options
context:
space:
mode:
authorSam Steingold1999-11-02 23:19:22 +0000
committerSam Steingold1999-11-02 23:19:22 +0000
commit4ff3fcc7d78b38790bfbf624485fe36952f18186 (patch)
treea0aa12708838e2bf6626de56063f70a087d29713 /lisp/progmodes
parent9e56fc95cc30cf80487cc1dbfb03f08e3ceaeed4 (diff)
downloademacs-4ff3fcc7d78b38790bfbf624485fe36952f18186.tar.gz
emacs-4ff3fcc7d78b38790bfbf624485fe36952f18186.zip
progmodes/cmacexp.el (c-macro-preprocessor): Find the Solaris cpp.
Diffstat (limited to 'lisp/progmodes')
-rw-r--r--lisp/progmodes/cmacexp.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/progmodes/cmacexp.el b/lisp/progmodes/cmacexp.el
index 2d69ddef7cf..bc3a1b584d3 100644
--- a/lisp/progmodes/cmacexp.el
+++ b/lisp/progmodes/cmacexp.el
@@ -45,7 +45,7 @@
45;; Put the following in your ~/.emacs file. 45;; Put the following in your ~/.emacs file.
46 46
47;; If you want the *Macroexpansion* window to be not higher than 47;; If you want the *Macroexpansion* window to be not higher than
48;; necessary: 48;; necessary:
49;;(setq c-macro-shrink-window-flag t) 49;;(setq c-macro-shrink-window-flag t)
50;; 50;;
51;; If you use a preprocessor other than /lib/cpp (be careful to set a 51;; If you use a preprocessor other than /lib/cpp (be careful to set a
@@ -112,6 +112,7 @@
112 system-configuration) 112 system-configuration)
113 (file-exists-p "/opt/SUNWspro/SC3.0.1/bin/acomp")) 113 (file-exists-p "/opt/SUNWspro/SC3.0.1/bin/acomp"))
114 "/opt/SUNWspro/SC3.0.1/bin/acomp -C -E") 114 "/opt/SUNWspro/SC3.0.1/bin/acomp -C -E")
115 ((file-exists-p "/usr/ccs/lib/cpp") "/usr/ccs/lib/cpp -C")
115 (t "/lib/cpp -C")) 116 (t "/lib/cpp -C"))
116 "The preprocessor used by the cmacexp package. 117 "The preprocessor used by the cmacexp package.
117 118
@@ -205,7 +206,7 @@ For use inside Lisp programs, see also `c-macro-expansion'."
205 (let ((oldwinheight (window-height)) 206 (let ((oldwinheight (window-height))
206 (alreadythere ;the window was already there 207 (alreadythere ;the window was already there
207 (get-buffer-window (current-buffer))) 208 (get-buffer-window (current-buffer)))
208 (popped nil)) ;the window popped changing the layout 209 (popped nil)) ;the window popped changing the layout
209 (or alreadythere 210 (or alreadythere
210 (progn 211 (progn
211 (display-buffer (current-buffer) t) 212 (display-buffer (current-buffer) t)
@@ -247,7 +248,7 @@ Optional arg DISPLAY non-nil means show messages in the echo area."
247;; Preprocess the buffer contents, then look for all the lines stored 248;; Preprocess the buffer contents, then look for all the lines stored
248;; in linelist starting from end of buffer. The last line so found is 249;; in linelist starting from end of buffer. The last line so found is
249;; where START was, so return the substring from point to end of 250;; where START was, so return the substring from point to end of
250;; buffer. 251;; buffer.
251 (let ((inbuf (current-buffer)) 252 (let ((inbuf (current-buffer))
252 (outbuf (get-buffer-create " *C Macro Expansion*")) 253 (outbuf (get-buffer-create " *C Macro Expansion*"))
253 (filename (if (and buffer-file-name 254 (filename (if (and buffer-file-name