2 files changed, 18 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c95f4b36d29..1872f8303ae 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2007-09-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * startup.el (normal-top-level): Remove DISPLAY from
+        process-environment to let it be computed dynamically in callproc.c
+
         * frame.el (frame-initialize, make-frame):
         * faces.el (tty-set-up-initial-frame-faces):
         * env.el (setenv): Don't set display-environment-variable.
diff --git a/lisp/startup.el b/lisp/startup.el
index 052f33fd175..a2f7a95651c 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -498,7 +498,21 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
     ;; unless told otherwise they should only assume a dumb terminal.
     ;; We are careful to do it late (after term-setup-hook), although the
     ;; new multi-tty code does not use $TERM any more there anyway.
-    (setenv "TERM" "dumb")))
+    (setenv "TERM" "dumb")
+    ;; Remove DISPLAY from the process-environment as well.  This allows
+    ;; `callproc.c' to give it a useful adaptive default which is either
+    ;; the value of the `display' frame-parameter or the DISPLAY value
+    ;; from initial-environment.
+    (let ((display (frame-parameter nil 'display)))
+      ;; Be careful which DISPLAY to remove from process-environment: follow
+      ;; the logic of `callproc.c'.
+      (if (stringp display) (setq display (concat "DISPLAY=" display))
+        (dolist (varval initial-environment)
+          (if (string-match "\\`DISPLAY=" varval)
+              (setq display varval))))
+      (when display
+        (message "Removing %s from process-environment" display)
+        (delete display process-environment)))))
 
 ;; Precompute the keyboard equivalents in the menu bar items.
 (defun precompute-menubar-bindings ()