# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1192047859 0
# Node ID c37307b0bf017590b33ca078aed47deb37847fc9
# Parent  0833864bd9a19e43e34143b3d551aac9bab34da4
* frame.c (Qenvironment): Remove.
(syms_of_frame) <Qenvironment>: Don't initialize.
(Fdelete_frame): Don't treat the `environment' param specially.
* frame.h (Qenvironment): Don't declare.
* callproc.c (set_initial_environment): Don't set unused frame param.

diff -r 0833864bd9a1 -r c37307b0bf01 src/ChangeLog
--- a/src/ChangeLog	Wed Oct 10 20:18:45 2007 +0000
+++ b/src/ChangeLog	Wed Oct 10 20:24:19 2007 +0000
@@ -1,7 +1,14 @@
 2007-10-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* frame.c (Qenvironment): Remove.
+	(syms_of_frame) <Qenvironment>: Don't initialize.
+	(Fdelete_frame): Don't treat the `environment' param specially.
+	* frame.h (Qenvironment): Don't declare.
+	* callproc.c (set_initial_environment): Don't set unused frame param.
+
 	* frame.c (Fframe_with_environment): Remove.
 	(syms_of_frame) <Sframe_with_environment>: Don't declare.
+
 	* lisp.h (Fframe_with_environment): Don't declare.
 
 2007-10-10  Juanma Barranquero  <lekktu@gmail.com>
diff -r 0833864bd9a1 -r c37307b0bf01 src/callproc.c
--- a/src/callproc.c	Wed Oct 10 20:18:45 2007 +0000
+++ b/src/callproc.c	Wed Oct 10 20:24:19 2007 +0000
@@ -1775,7 +1775,6 @@
       for (envp = environ; *envp; envp++)
 	Vprocess_environment = Fcons (build_string (*envp),
 				      Vprocess_environment);
-      store_frame_param (SELECTED_FRAME(), Qenvironment, Vprocess_environment);
       /* Ideally, the `copy' shouldn't be necessary, but it seems it's frequent
 	 to use `delete' and friends on process-environment.  */
       Vinitial_environment = Fcopy_sequence (Vprocess_environment);
diff -r 0833864bd9a1 -r c37307b0bf01 src/frame.c
--- a/src/frame.c	Wed Oct 10 20:18:45 2007 +0000
+++ b/src/frame.c	Wed Oct 10 20:24:19 2007 +0000
@@ -110,7 +110,6 @@
 Lisp_Object Qtty_color_mode;
 Lisp_Object Qtty, Qtty_type;
 Lisp_Object Qwindow_system;
-Lisp_Object Qenvironment;
 
 Lisp_Object Qfullscreen, Qfullwidth, Qfullheight, Qfullboth;
 
@@ -1469,24 +1468,6 @@
   if (EQ (f->minibuffer_window, echo_area_window))
     echo_area_window = sf->minibuffer_window;
 
-  /* Don't allow other frames to refer to a deleted frame in their
-     'environment parameter.  */
-  {
-    Lisp_Object tail, frame1;
-    Lisp_Object env = get_frame_param (XFRAME (frame), Qenvironment);
-    FOR_EACH_FRAME (tail, frame1)
-      {
-        if (EQ (frame, frame1) || !FRAME_LIVE_P (XFRAME (frame1)))
-          continue;
-        if (EQ (frame, get_frame_param (XFRAME (frame1), Qenvironment)))
-          {
-            store_frame_param (XFRAME (frame1), Qenvironment, env);
-            if (!FRAMEP (env))
-              env = frame1;
-          }
-      }
-  }
-  
   /* Clear any X selections for this frame.  */
 #ifdef HAVE_X_WINDOWS
   if (FRAME_X_P (f))
@@ -4310,8 +4291,6 @@
   staticpro (&Qtty_type);
   Qwindow_system = intern ("window-system");
   staticpro (&Qwindow_system);
-  Qenvironment = intern ("environment");
-  staticpro (&Qenvironment);
 
   Qface_set_after_frame_default = intern ("face-set-after-frame-default");
   staticpro (&Qface_set_after_frame_default);
diff -r 0833864bd9a1 -r c37307b0bf01 src/frame.h
--- a/src/frame.h	Wed Oct 10 20:18:45 2007 +0000
+++ b/src/frame.h	Wed Oct 10 20:24:19 2007 +0000
@@ -784,7 +784,6 @@
 extern Lisp_Object Qframep, Qframe_live_p;
 extern Lisp_Object Qtty, Qtty_type;
 extern Lisp_Object Qterminal, Qterminal_live_p;
-extern Lisp_Object Qenvironment;
 
 extern struct frame *last_nonminibuf_frame;