* frame.c (Fframe_with_environment): Remove.

(syms_of_frame) <Sframe_with_environment>: Don't declare.
* lisp.h (Fframe_with_environment): Don't declare.

3 files changed, 10 insertions, 45 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 385fb503af3..995ab26e2c1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * 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>
 
         * indent.c (indent_tabs_mode, last_known_column)
@@ -13,13 +19,12 @@
         * keyboard.c (kbd_buffer_get_event): Break loop waiting for input
         when there's an unread command event.
 
-        * frame.c (focus_follows_mouse): Moved here from frame.el to allow
+        * frame.c (focus_follows_mouse): Move here from frame.el to allow
         window autoselection act appropriately when leaving selected frame.
         (syms_of_frame): Initialize focus_follows_mouse.
         * frame.h (focus_follows_mouse): Extern it.
         * macterm.c (XTread_socket): When focus_follows_mouse is nil
-        make SELECT_WINDOW_EVENT only if we don't leave the selected
-        frame.
+        make SELECT_WINDOW_EVENT only if we don't leave the selected frame.
         * msdos.c (dos_rawgetc): Likewise.
         * w32term.c (w32_read_socket): Likewise.
         * xterm.c (handle_one_xevent): Likewise.
@@ -49,7 +54,7 @@
 
 2007-10-08  Richard Stallman  <rms@gnu.org>
 
-        * image.c (our_memory_buffer): Renamed from omfib_buffer.
+        * image.c (our_memory_buffer): Rename from omfib_buffer.
 
 2007-10-08  Richard Stallman  <rms@gnu.org>
 
@@ -305,8 +310,7 @@
 
 2007-09-22  Eli Zaretskii  <eliz@gnu.org>
 
-        * term.c (DEV_TTY): New macro.  Provide a definition for
-        MS-Windows.
+        * term.c (DEV_TTY): New macro.  Provide a definition for MS-Windows.
         (FRAME_TERMCAP_P) [WINDOWSNT]: Don't define to zero.
         (Fcontrolling_tty_p, Fresume_tty, dissociate_if_controlling_tty)
         (init_tty): Use DEV_TTY instead of "/dev/tty".
diff --git a/src/frame.c b/src/frame.c
index 3709b00dfd6..866bd3fa94b 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2608,43 +2608,6 @@ enabled such bindings for that variable with `make-variable-frame-local'.  */)
     }
   return Qnil;
 }
-
-DEFUN ("frame-with-environment", Fframe_with_environment, Sframe_with_environment, 0, 1, 0,
-       doc: /* Return the frame that has the environment variable list for FRAME.
-
-The frame-local environment variable list is normally shared between
-frames that were created in the same Emacsclient session.  The
-environment list is stored in a single frame's 'environment parameter;
-the other frames' 'environment parameter is set to this frame.  This
-function follows the chain of 'environment references to reach the
-frame that stores the actual local environment list, and returns that
-frame.  */)
-     (frame)
-     Lisp_Object frame;
-{
-  Lisp_Object hare, tortoise;
-
-  if (NILP (frame))
-    frame = selected_frame;
-  CHECK_FRAME (frame);
-
-  hare = tortoise = get_frame_param (XFRAME (frame), Qenvironment);
-  while (!NILP (hare) && FRAMEP (hare))
-    {
-      frame = hare;
-      hare = get_frame_param (XFRAME (hare), Qenvironment);
-      if (NILP (hare) || !FRAMEP (hare))
-        break;
-      frame = hare;
-      hare = get_frame_param (XFRAME (hare), Qenvironment);
-      tortoise = get_frame_param (XFRAME (tortoise), Qenvironment);
-      if (EQ (hare, tortoise))
-        error ("Cyclic frame-local environment indirection");
-    }
-
-  return frame;
-}
-
 
 DEFUN ("frame-char-height", Fframe_char_height, Sframe_char_height,
        0, 1, 0,
@@ -4548,7 +4511,6 @@ automatically.  */);
   defsubr (&Sframe_parameters);
   defsubr (&Sframe_parameter);
   defsubr (&Smodify_frame_parameters);
-  defsubr (&Sframe_with_environment);
   defsubr (&Sframe_char_height);
   defsubr (&Sframe_char_width);
   defsubr (&Sframe_pixel_height);
diff --git a/src/lisp.h b/src/lisp.h
index 43daded691a..55ca36d5c61 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3043,7 +3043,6 @@ EXFUN (Fvisible_frame_list, 0);
 EXFUN (Fframe_parameter, 2);
 EXFUN (Fframe_parameters, 1);
 EXFUN (Fmodify_frame_parameters, 2);
-EXFUN (Fframe_with_environment, 1);
 EXFUN (Fset_frame_height, 3);
 EXFUN (Fset_frame_width, 3);
 EXFUN (Fset_frame_size, 3);