(Qdisplay_environment_variable): Delete.

diff --git a/etc/NEWS b/etc/NEWS
index dc99241334d51156b1cf2fdf27f4a4b973b02ef6..a154234f6faaeb9f5c6cfa4c03ebe76dfc54862f 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -242,6 +242,8 @@ supported on other platforms, but not on Windows due to using the winsock
 *** $TERM is now set to `dumb' for subprocesses.  If you want to know the
 $TERM inherited by Emacs you will have to look inside initial-environment.
 
+*** $DISPLAY is now dynamically inherited from the frame's `display'.
+
 *** The `window-system' variable has been made frame-local. The new
 `initial-window-system' variable contains the `window-system' value
 for the first frame.
@@ -275,8 +277,6 @@ function-key-map variables that already existed.
 
 *** `initial-environment' holds the environment inherited from Emacs's parent.
 
-*** New frame parameter `display-environment-variable'.
-
 *** The `keyboard-translate-table' variable and the terminal and
 keyboard coding systems have been made terminal-local.
 

diff --git a/src/ChangeLog b/src/ChangeLog
index 46676098ddcc837bcbb7230807540978333d2e90..01332c0b9f5d6957e4ae8038eb0e2f92ad13eaf3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2007-09-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * frame.c (Qdisplay_environment_variable):
+       * frame.h (Qdisplay_environment_variable): Delete.
+
        * .gdbinit (xbacktrace): Print the arg's address rather than the value
        of the first arg, since that value may be a union.
 

diff --git a/src/frame.c b/src/frame.c
index 4a526c040d5400bc28ebf41679509de6953c7258..6596111d0ca8ce65d00c0e1e7d419cbeee6d490f 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -111,7 +111,6 @@ Lisp_Object Qtty_color_mode;
 Lisp_Object Qtty, Qtty_type;
 Lisp_Object Qwindow_system;
 Lisp_Object Qenvironment;
-Lisp_Object Qdisplay_environment_variable;
 
 Lisp_Object Qfullscreen, Qfullwidth, Qfullheight, Qfullboth;
 
@@ -4356,9 +4355,6 @@ syms_of_frame ()
   Qenvironment = intern ("environment");
   staticpro (&Qenvironment);
 
-  Qdisplay_environment_variable = intern ("display-environment-variable");
-  staticpro (&Qdisplay_environment_variable);
-
   Qface_set_after_frame_default = intern ("face-set-after-frame-default");
   staticpro (&Qface_set_after_frame_default);
 

diff --git a/src/frame.h b/src/frame.h
index 73a3458292c11e86334d0762a1a6ed4136f488fc..78657958014e90a74e279e681cc9411fe9f0895c 100644 (file)
--- a/src/frame.h
+++ b/src/frame.h
@@ -780,7 +780,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 Lisp_Object Qdisplay_environment_variable;
 
 extern struct frame *last_nonminibuf_frame;