aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorSam Steingold2005-04-29 18:23:33 +0000
committerSam Steingold2005-04-29 18:23:33 +0000
commitbb9c1f2a82c70e9e020c6d3926dac4263621c4c4 (patch)
tree24af708a04d95028d22cb2efd239f2dc1ed3f369 /lisp
parent2d5e5eb8a7642fff91ef9e30cb5002041a54cdea (diff)
downloademacs-bb9c1f2a82c70e9e020c6d3926dac4263621c4c4.tar.gz
emacs-bb9c1f2a82c70e9e020c6d3926dac4263621c4c4.zip
(cc-mode-cpp-program): New user variable.
(cc-create-define-alist): Use it instead of the hard-coded string.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/cc-mode.el4
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 75b4168edde..cab0cc3f468 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12005-04-29 Sam Steingold <sds@gnu.org>
2
3 * progmodes/cc-mode.el (cc-mode-cpp-program): New user variable.
4 (cc-create-define-alist): Use it instead of the hard-coded string.
5
12005-04-29 Stefan Monnier <monnier@iro.umontreal.ca> 62005-04-29 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * international/mule-conf.el (file-coding-system-alist): Fix regexp 8 * international/mule-conf.el (file-coding-system-alist): Fix regexp
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index b464c1483b1..920b253d4b7 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -640,13 +640,15 @@ Note that the style variables are always made local to the buffer."
640;;;###autoload (add-to-list 'auto-mode-alist '("\\.lex\\'" . c-mode)) 640;;;###autoload (add-to-list 'auto-mode-alist '("\\.lex\\'" . c-mode))
641 641
642(defvar cc-define-alist nil "Alist of #define directives for GUD tooltips.") 642(defvar cc-define-alist nil "Alist of #define directives for GUD tooltips.")
643(defvar cc-mode-cpp-program "/lib/cpp"
644 "*The program name for the CPP pre-processor.")
643 645
644(defun cc-create-define-alist () 646(defun cc-create-define-alist ()
645 (let* ((file (buffer-file-name)) 647 (let* ((file (buffer-file-name))
646 (output 648 (output
647 (with-output-to-string 649 (with-output-to-string
648 (with-current-buffer standard-output 650 (with-current-buffer standard-output
649 (call-process "/lib/cpp" 651 (call-process cc-mode-cpp-program
650 file t nil "-dM")))) 652 file t nil "-dM"))))
651 (define-list (split-string output "\n" t)) 653 (define-list (split-string output "\n" t))
652 (name)) 654 (name))