mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-06 22:31:13 -07:00
Code Issues Projects Releases Wiki Activity

(normal-top-level): Remove DISPLAY from process-environment to let it be

Browse source 
computed dynamically in callproc.c
This commit is contained in:
Stefan Monnier 2007-09-21 07:24:01 +00:00
parent 5dcbade216
commit 4bbfda32bb
2 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -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.

16
lisp/startup.el
View file

@ -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 ()