Mercurial > emacs
changeset 85146:c37307b0bf01
* 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.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 10 Oct 2007 20:24:19 +0000 |
| parents | 0833864bd9a1 |
| children | c164c81cba59 |
| files | src/ChangeLog src/callproc.c src/frame.c src/frame.h |
| diffstat | 4 files changed, 7 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- 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>
--- 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);
--- 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);
--- 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;