Fixed environment variable handling during terminal initialization.

lisp/server.el (server-getenv): New inline function.

lisp/term/rxvt.el (rxvt-set-background-mode): Use server-getenv
instead of getenv.
lisp/term/x-win.el (x-initialize-window-system): Ditto.
lisp/term/xterm.el (xterm-rxvt-set-background-mode): Ditto.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-158

3 files changed, 11 insertions, 5 deletions

diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el
index 7839ebba95d..3dbea1d46b2 100644
--- a/lisp/term/rxvt.el
+++ b/lisp/term/rxvt.el
@@ -26,6 +26,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'server))
+
 ;; Set up function-key-map entries that termcap and terminfo don't know.
 (let ((map (make-sparse-keymap)))
   (define-key map "\e[A" [up])
@@ -148,7 +150,7 @@ for the currently selected frame."
 ;; intelligent way than the default guesswork in startup.el.
 (defun rxvt-set-background-mode ()
   "Set background mode as appropriate for the default rxvt colors."
-  (let ((fgbg (getenv "COLORFGBG"))
+  (let ((fgbg (server-getenv "COLORFGBG"))
         bg rgb)
     (setq frame-background-mode 'light) ; default
     (when (and fgbg
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 381ee606300..55ad3800e0b 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -84,6 +84,8 @@
 (require 'fontset)
 (require 'x-dnd)
 
+(eval-when-compile (require 'server))
+
 (defvar x-invocation-args)
 
 (defvar x-command-line-resources nil)
@@ -2365,7 +2367,7 @@ order until succeed.")
           (aset x-resource-name i ?-))))
 
   (x-open-connection (or x-display-name
-                         (setq x-display-name (getenv "DISPLAY")))
+                         (setq x-display-name (server-getenv "DISPLAY")))
                      x-command-line-resources
                      ;; Exit Emacs with fatal error if this fails and we
                      ;; are the initial display.
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index 5c387cb4148..e05b2f27324 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -26,6 +26,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'server))
+
 (let ((map (make-sparse-keymap)))
   (define-key map "\e[A" [up])
   (define-key map "\e[B" [down])
@@ -208,7 +210,7 @@ versions of xterm."
 ;; intelligent way than the default guesswork in startup.el.
 (defun xterm-rxvt-set-background-mode ()
   "Set background mode as appropriate for the default rxvt colors."
-  (let ((fgbg (getenv "COLORFGBG"))
+  (let ((fgbg (server-getenv "COLORFGBG"))
         bg rgb)
     (setq frame-background-mode 'light) ; default
     (when (and fgbg
@@ -230,8 +232,8 @@ versions of xterm."
 (xterm-register-default-colors)
 ;; If this xterm is actually a disguised rxvt, be more intelligent about
 ;; determining the background mode.
-(and (getenv "COLORTERM")
-     (string-match "\\`rxvt" (getenv "COLORTERM"))
+(and (server-getenv "COLORTERM")
+     (string-match "\\`rxvt" (server-getenv "COLORTERM"))
      (xterm-rxvt-set-background-mode))
 ;; This recomputes all the default faces given the colors we've just set up.
 (tty-set-up-initial-frame-faces)