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 @@
+2011-09-08  Juri Linkov  <juri@jurta.org>
+
+        * progmodes/compile.el (compilation-environment): Make it
+        a defcustom (bug#8340).
+
 2011-09-08  Martin Rudalics  <rudalics@gmx.at>
 
         * 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,
 and exit message; it returns a cons (MESSAGE . MODELINE) of the strings to
 write into the compilation buffer, and to put in its mode line.")
 
-(defvar compilation-environment nil
-  "*List of environment variables for compilation to inherit.
+(defcustom compilation-environment nil
+  "List of environment variables for compilation to inherit.
 Each element should be a string of the form ENVVARNAME=VALUE.
 This list is temporarily prepended to `process-environment' prior to
-starting the compilation process.")
+starting the compilation process."
+  :type '(repeat (string :tag "ENVVARNAME=VALUE"))
+  :options '(("LANG=C"))
+  :group 'compilation
+  :version "24.1")
 
 ;; History of compile commands.
 (defvar compile-history nil)