2 files changed, 4 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 58107d8584c..117ebb6acad 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2007-10-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * frame.el (frame-inherited-parameters): Remove unused `environment'
+        parameter, and let server.el add `client' when needed.
+
         * server.el (server-create-tty-frame)
         (server-create-window-system-frame): Set frame-inherited-parameters.
 
diff --git a/lisp/frame.el b/lisp/frame.el
index 656a462e7c9..37673835f34 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -673,7 +673,7 @@ The functions are run with one arg, the newly created frame.")
 ;; Alias, kept temporarily.
 (define-obsolete-function-alias 'new-frame 'make-frame "22.1")
 
-(defvar frame-inherited-parameters '(environment client)
+(defvar frame-inherited-parameters '()
   ;; FIXME: Shouldn't we add `font' here as well?
   "Parameters `make-frame' copies from the `selected-frame' to the new frame.")