diff options
| author | Juri Linkov | 2011-09-08 15:12:18 +0300 |
|---|---|---|
| committer | Juri Linkov | 2011-09-08 15:12:18 +0300 |
| commit | 97f05794552e8415ccc7522017f4dff06f84d1a4 (patch) | |
| tree | d4c5e0773bcba0abe0f75d6147143a25f8c583b2 /lisp | |
| parent | bfe5d7f0e34ca8264dea23e7ecadde9536c53ba1 (diff) | |
| download | emacs-97f05794552e8415ccc7522017f4dff06f84d1a4.tar.gz emacs-97f05794552e8415ccc7522017f4dff06f84d1a4.zip | |
* lisp/progmodes/compile.el (compilation-environment): Make it a defcustom.
Fixes: debbugs:8340
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/compile.el | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c314cdf201d..6d64950d64b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-09-08 Juri Linkov <juri@jurta.org> | ||
| 2 | |||
| 3 | * progmodes/compile.el (compilation-environment): Make it | ||
| 4 | a defcustom (bug#8340). | ||
| 5 | |||
| 1 | 2011-09-08 Martin Rudalics <rudalics@gmx.at> | 6 | 2011-09-08 Martin Rudalics <rudalics@gmx.at> |
| 2 | 7 | ||
| 3 | * window.el (frame-auto-delete): Rename to window-auto-delete. | 8 | * window.el (frame-auto-delete): Rename to window-auto-delete. |
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 4871c980fb5..cd891a8df60 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el | |||
| @@ -637,11 +637,15 @@ This should be a function of three arguments: process status, exit status, | |||
| 637 | and exit message; it returns a cons (MESSAGE . MODELINE) of the strings to | 637 | and exit message; it returns a cons (MESSAGE . MODELINE) of the strings to |
| 638 | write into the compilation buffer, and to put in its mode line.") | 638 | write into the compilation buffer, and to put in its mode line.") |
| 639 | 639 | ||
| 640 | (defvar compilation-environment nil | 640 | (defcustom compilation-environment nil |
| 641 | "*List of environment variables for compilation to inherit. | 641 | "List of environment variables for compilation to inherit. |
| 642 | Each element should be a string of the form ENVVARNAME=VALUE. | 642 | Each element should be a string of the form ENVVARNAME=VALUE. |
| 643 | This list is temporarily prepended to `process-environment' prior to | 643 | This list is temporarily prepended to `process-environment' prior to |
| 644 | starting the compilation process.") | 644 | starting the compilation process." |
| 645 | :type '(repeat (string :tag "ENVVARNAME=VALUE")) | ||
| 646 | :options '(("LANG=C")) | ||
| 647 | :group 'compilation | ||
| 648 | :version "24.1") | ||
| 645 | 649 | ||
| 646 | ;; History of compile commands. | 650 | ;; History of compile commands. |
| 647 | (defvar compile-history nil) | 651 | (defvar compile-history nil) |