diff options
| author | Stefan Monnier | 2007-10-10 20:44:34 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2007-10-10 20:44:34 +0000 |
| commit | 9e48337731ca5bb809ceb5f998cd44b342f1ff50 (patch) | |
| tree | 9747a4dd4e0d068069586d7c3d746b2501939d53 | |
| parent | 4419b7550fe0373114104d81a63e5cd881e37c74 (diff) | |
| download | emacs-9e48337731ca5bb809ceb5f998cd44b342f1ff50.tar.gz emacs-9e48337731ca5bb809ceb5f998cd44b342f1ff50.zip | |
(frame-inherited-parameters): Remove unused `environment'
parameter, and let server.el add `client' when needed.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/frame.el | 2 |
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 @@ | |||
| 1 | 2007-10-10 Stefan Monnier <monnier@iro.umontreal.ca> | 1 | 2007-10-10 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 2 | ||
| 3 | * frame.el (frame-inherited-parameters): Remove unused `environment' | ||
| 4 | parameter, and let server.el add `client' when needed. | ||
| 5 | |||
| 3 | * server.el (server-create-tty-frame) | 6 | * server.el (server-create-tty-frame) |
| 4 | (server-create-window-system-frame): Set frame-inherited-parameters. | 7 | (server-create-window-system-frame): Set frame-inherited-parameters. |
| 5 | 8 | ||
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.") | |||
| 673 | ;; Alias, kept temporarily. | 673 | ;; Alias, kept temporarily. |
| 674 | (define-obsolete-function-alias 'new-frame 'make-frame "22.1") | 674 | (define-obsolete-function-alias 'new-frame 'make-frame "22.1") |
| 675 | 675 | ||
| 676 | (defvar frame-inherited-parameters '(environment client) | 676 | (defvar frame-inherited-parameters '() |
| 677 | ;; FIXME: Shouldn't we add `font' here as well? | 677 | ;; FIXME: Shouldn't we add `font' here as well? |
| 678 | "Parameters `make-frame' copies from the `selected-frame' to the new frame.") | 678 | "Parameters `make-frame' copies from the `selected-frame' to the new frame.") |
| 679 | 679 | ||