diff options
| author | Stefan Monnier | 2007-08-31 07:34:50 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2007-08-31 07:34:50 +0000 |
| commit | 92d9c1d40ccc67383240a15fbc266758d344cf13 (patch) | |
| tree | 1ace93de983a9fac394e4e06fa575986f1822fbe /src | |
| parent | 200ab68380fe5146aa9d26434228f315ce845f63 (diff) | |
| download | emacs-92d9c1d40ccc67383240a15fbc266758d344cf13.tar.gz emacs-92d9c1d40ccc67383240a15fbc266758d344cf13.zip | |
(Qterm_environment_variable): Remove.
(syms_of_frame): Don't init and staticpro it.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/frame.c | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 956f191df02..fa80f58e10b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,12 @@ | |||
| 1 | 2007-08-31 Stefan Monnier <monnier@iro.umontreal.ca> | 1 | 2007-08-31 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 2 | ||
| 3 | * frame.h: | ||
| 4 | * frame.c (Qterm_environment_variable): Remove. | ||
| 5 | (syms_of_frame): Don't init and staticpro it. | ||
| 6 | |||
| 7 | |||
| 8 | * callproc.c (getenv_internal): Remove special case for $TERM. | ||
| 9 | |||
| 3 | * callproc.c (Vinitial_environment): New variable. | 10 | * callproc.c (Vinitial_environment): New variable. |
| 4 | (set_initial_environment): Initialize it. | 11 | (set_initial_environment): Initialize it. |
| 5 | (syms_of_callproc): Declare it. | 12 | (syms_of_callproc): Declare it. |
diff --git a/src/frame.c b/src/frame.c index f721a829e2b..8162cd1fd94 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -111,7 +111,6 @@ Lisp_Object Qtty_color_mode; | |||
| 111 | Lisp_Object Qtty, Qtty_type; | 111 | Lisp_Object Qtty, Qtty_type; |
| 112 | Lisp_Object Qwindow_system; | 112 | Lisp_Object Qwindow_system; |
| 113 | Lisp_Object Qenvironment; | 113 | Lisp_Object Qenvironment; |
| 114 | Lisp_Object Qterm_environment_variable; | ||
| 115 | Lisp_Object Qdisplay_environment_variable; | 114 | Lisp_Object Qdisplay_environment_variable; |
| 116 | 115 | ||
| 117 | Lisp_Object Qfullscreen, Qfullwidth, Qfullheight, Qfullboth; | 116 | Lisp_Object Qfullscreen, Qfullwidth, Qfullheight, Qfullboth; |
| @@ -4357,8 +4356,6 @@ syms_of_frame () | |||
| 4357 | Qenvironment = intern ("environment"); | 4356 | Qenvironment = intern ("environment"); |
| 4358 | staticpro (&Qenvironment); | 4357 | staticpro (&Qenvironment); |
| 4359 | 4358 | ||
| 4360 | Qterm_environment_variable = intern ("term-environment-variable"); | ||
| 4361 | staticpro (&Qterm_environment_variable); | ||
| 4362 | Qdisplay_environment_variable = intern ("display-environment-variable"); | 4359 | Qdisplay_environment_variable = intern ("display-environment-variable"); |
| 4363 | staticpro (&Qdisplay_environment_variable); | 4360 | staticpro (&Qdisplay_environment_variable); |
| 4364 | 4361 | ||