el/dot-emacs.el: Preserve environment properly when clearing `LD_PRELOAD'.

[profile] / el / dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 97ad03c..c0d2fe2 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -578,7 +578,7 @@ Pretend they don't exist.  They might be on other display devices."
 
 (defadvice compile (around hack-environment compile activate)
   "Hack the environment inherited by inferiors in the compilation."
-  (let ((process-environment process-environment))
+  (let ((process-environment (copy-tree process-environment)))
     (setenv "LD_PRELOAD" nil)
     ad-do-it))
 
@@ -2080,7 +2080,7 @@ name, as a symbol."
                      "__typeof__"       ;GCC
                      "__volatile__"     ;GCC
                      ))
-       (c-constants
+       (c-builtins
         (mdw-regexps "false"            ;C++, C99 macro
                      "this"             ;C++
                      "true"             ;C++, C99 macro
@@ -2116,7 +2116,7 @@ name, as a symbol."
           (list (concat "\\<\\(" c-keywords "\\)\\>")
                 '(0 font-lock-keyword-face))
 
-          (list (concat "\\<\\(" c-constants "\\)\\>")
+          (list (concat "\\<\\(" c-builtins "\\)\\>")
                 '(0 font-lock-variable-name-face))
 
           ;; Handle numbers too.
@@ -2229,7 +2229,7 @@ name, as a symbol."
                      "void" "volatile"
                      "while"))
 
-       (java-constants
+       (java-builtins
         (mdw-regexps "false" "null" "super" "this" "true")))
 
     (setq font-lock-keywords
@@ -2239,8 +2239,8 @@ name, as a symbol."
           (list (concat "\\<\\(" java-keywords "\\)\\>")
                 '(0 font-lock-keyword-face))
 
-          ;; Handle the magic constants defined above.
-          (list (concat "\\<\\(" java-constants "\\)\\>")
+          ;; Handle the magic builtins defined above.
+          (list (concat "\\<\\(" java-builtins "\\)\\>")
                 '(0 font-lock-variable-name-face))
 
           ;; Handle numbers too.
@@ -2282,11 +2282,8 @@ name, as a symbol."
                      "private" "protected" "public" "return" "short"
                      "static" "super" "switch" "synchronized" "throw"
                      "throws" "transient" "try" "typeof" "var" "void"
-                     "volatile" "while" "with" "yield"
-
-                     "boolean" "byte" "char" "double" "float" "int" "long"
-                     "short" "void"))
-       (javascript-constants
+                     "volatile" "while" "with" "yield"))
+       (javascript-builtins
         (mdw-regexps "false" "null" "undefined" "Infinity" "NaN" "true"
                      "arguments" "this")))
 
@@ -2297,8 +2294,8 @@ name, as a symbol."
           (list (concat "\\_<\\(" javascript-keywords "\\)\\_>")
                 '(0 font-lock-keyword-face))
 
-          ;; Handle the predefined constants defined above.
-          (list (concat "\\_<\\(" javascript-constants "\\)\\_>")
+          ;; Handle the predefined builtins defined above.
+          (list (concat "\\_<\\(" javascript-builtins "\\)\\_>")
                 '(0 font-lock-variable-name-face))
 
           ;; Handle numbers too.
@@ -2424,7 +2421,7 @@ name, as a symbol."
                      "unsafe" "ushort" "using" "virtual" "void" "volatile"
                      "while" "yield"))
 
-       (csharp-constants
+       (csharp-builtins
         (mdw-regexps "base" "false" "null" "this" "true")))
 
     (setq font-lock-keywords
@@ -2434,8 +2431,8 @@ name, as a symbol."
           (list (concat "\\<\\(" csharp-keywords "\\)\\>")
                 '(0 font-lock-keyword-face))
 
-          ;; Handle the magic constants defined above.
-          (list (concat "\\<\\(" csharp-constants "\\)\\>")
+          ;; Handle the magic builtins defined above.
+          (list (concat "\\<\\(" csharp-builtins "\\)\\>")
                 '(0 font-lock-variable-name-face))
 
           ;; Handle numbers too.
@@ -4036,13 +4033,13 @@ This allows you to pass a list of arguments through `ansi-term'."
 
 (defadvice term-exec-1 (around hack-environment compile activate)
   "Hack the environment inherited by inferiors in the terminal."
-  (let ((process-environment process-environment))
+  (let ((process-environment (copy-tree process-environment)))
     (setenv "LD_PRELOAD" nil)
     ad-do-it))
 
 (defadvice shell (around hack-environment compile activate)
   "Hack the environment inherited by inferiors in the shell."
-  (let ((process-environment process-environment))
+  (let ((process-environment (copy-tree process-environment)))
     (setenv "LD_PRELOAD" nil)
     ad-do-it))