* 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.

4 files changed, 7 insertions, 23 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 995ab26e2c1..e35d7383658 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/callproc.c b/src/callproc.c
index 0fa0c3a8662..c10dea566bf 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -1775,7 +1775,6 @@ set_initial_environment ()
       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 --git a/src/frame.c b/src/frame.c
index 866bd3fa94b..927f448dd0b 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -110,7 +110,6 @@ Lisp_Object Qbuffer_predicate, Qbuffer_list, Qburied_buffer_list;
 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 @@ The functions are run with one arg, the frame to be deleted.  */)
   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 @@ syms_of_frame ()
   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 --git a/src/frame.h b/src/frame.h
index 7c058d569aa..d76cc15402a 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -784,7 +784,6 @@ typedef struct frame *FRAME_PTR;
 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;