diff options
| author | Eli Zaretskii | 2001-09-02 17:29:14 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2001-09-02 17:29:14 +0000 |
| commit | 883310a73162f2e7f85aefbb98d0b60d4a676589 (patch) | |
| tree | 6b7688891888c5155d3baca2cb58af4f8e859d10 | |
| parent | 0b61e47e946c3bc7c4fc489f23684bf67a321a64 (diff) | |
| download | emacs-883310a73162f2e7f85aefbb98d0b60d4a676589.tar.gz emacs-883310a73162f2e7f85aefbb98d0b60d4a676589.zip | |
(c-macro-preprocessor): Use "gcc -E" for
MS-DOS, since cpp might not be available.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/progmodes/cmacexp.el | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 099da8d1dc5..fd3907897d5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2001-09-02 Eli Zaretskii <eliz@is.elta.co.il> | 1 | 2001-09-02 Eli Zaretskii <eliz@is.elta.co.il> |
| 2 | 2 | ||
| 3 | * progmodes/cmacexp.el (c-macro-preprocessor): Use "gcc -E" for | ||
| 4 | MS-DOS, since cpp might not be available. | ||
| 5 | |||
| 3 | * menu-bar.el (menu-bar-edit-menu) <yank-menu, yank>: Mention | 6 | * menu-bar.el (menu-bar-edit-menu) <yank-menu, yank>: Mention |
| 4 | "yank" in the help-echo text. Suggested by Pavel Jan,Bm(Bk | 7 | "yank" in the help-echo text. Suggested by Pavel Jan,Bm(Bk |
| 5 | <Pavel@Janik.cz>. | 8 | <Pavel@Janik.cz>. |
diff --git a/lisp/progmodes/cmacexp.el b/lisp/progmodes/cmacexp.el index a701da6e808..a42df869dfd 100644 --- a/lisp/progmodes/cmacexp.el +++ b/lisp/progmodes/cmacexp.el | |||
| @@ -108,8 +108,10 @@ | |||
| 108 | :group 'c-macro) | 108 | :group 'c-macro) |
| 109 | 109 | ||
| 110 | (defcustom c-macro-preprocessor | 110 | (defcustom c-macro-preprocessor |
| 111 | ;; Cannot rely on standard directory on MS-DOS to find CPP. | 111 | ;; Cannot rely on standard directory on MS-DOS to find CPP. In |
| 112 | (cond ((eq system-type 'ms-dos) "cpp -C") | 112 | ;; fact, cannot rely on having cpp.exe, either, in latest GCC |
| 113 | ;; versions. | ||
| 114 | (cond ((eq system-type 'ms-dos) "gcc -E -C -o - -") | ||
| 113 | ;; Solaris has it in an unusual place. | 115 | ;; Solaris has it in an unusual place. |
| 114 | ((and (string-match "^[^-]*-[^-]*-\\(solaris\\|sunos5\\)" | 116 | ((and (string-match "^[^-]*-[^-]*-\\(solaris\\|sunos5\\)" |
| 115 | system-configuration) | 117 | system-configuration) |