[Emacs-diffs] Changes to emacs/lisp/server.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        07/09/21 07:10:09

Index: server.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/server.el,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -b -r1.139 -r1.140
--- server.el   19 Sep 2007 02:00:54 -0000      1.139
+++ server.el   21 Sep 2007 07:10:07 -0000      1.140
@@ -213,22 +213,6 @@
 New clients have no properties."
   (add-to-list 'server-clients proc))
 
-(defun server-getenv-from (env variable)
-  "Get the value of VARIABLE in ENV.
-VARIABLE should be a string.  Value is nil if VARIABLE is
-undefined in ENV.  Otherwise, value is a string.
-
-ENV should be in the same format as `process-environment'."
-  (let (entry result)
-    (while (and env (null result))
-      (setq entry (car env)
-           env (cdr env))
-      (if (and (> (length entry) (length variable))
-              (eq ?= (aref entry (length variable)))
-              (equal variable (substring entry 0 (length variable))))
-         (setq result (substring entry (+ (length variable) 1)))))
-    result))
-
 (defmacro server-with-environment (env vars &rest body)
   "Evaluate BODY with environment variables VARS set to those in ENV.
 The environment variables are then restored to their previous values.
@@ -240,7 +224,7 @@
        (value (make-symbol "value")))
     `(let ((process-environment process-environment))
        (dolist (,var ,vars)
-        (let ((,value (server-getenv-from ,env ,var)))
+         (let ((,value (getenv-internal ,var ,env)))
            (push (if (null ,value)
                      ,var
                    (concat ,var "=" ,value))
@@ -585,11 +569,12 @@
                               `((client . ,proc)
                                 (environment . ,(process-get proc 'env)))))))
   
-    (set-frame-parameter frame 'display-environment-variable
-                         (server-getenv-from (process-get proc 'env) 
"DISPLAY"))
+    ;; ttys don't use the `display' parameter, but callproc.c does to set
+    ;; the DISPLAY environment on subprocesses.
+    (set-frame-parameter frame 'display
+                         (getenv-internal "DISPLAY" (process-get proc 'env)))
     (select-frame frame)
     (process-put proc 'frame frame)
-    (process-put proc 'tty (terminal-name frame))
     (process-put proc 'terminal (frame-terminal frame))
 
     ;; Display *scratch* by default.
@@ -601,7 +586,7 @@
     frame))
 
 (defun server-create-window-system-frame (display nowait proc)
-  (if (not (fboundp 'x-create-frame))
+  (if (not (fboundp 'make-frame-on-display))
       (progn
         ;; This emacs does not support X.
         (server-log "Window system unsupported" proc)
@@ -626,8 +611,6 @@
       ;; initialization parameters for X frames at
       ;; the moment.
       (modify-frame-parameters frame params)
-      (set-frame-parameter frame 'display-environment-variable 
-                           (server-getenv-from (process-get proc 'env) 
"DISPLAY"))
       (select-frame frame)
       (process-put proc 'frame frame)
       (process-put proc 'terminal (frame-terminal frame))