[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp server.el
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] emacs/lisp server.el |
Date: |
Sat, 10 Jan 2009 13:07:04 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 09/01/10 13:07:04
Modified files:
lisp : server.el
Log message:
Revert previous change (commit mistake).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/server.el?cvsroot=emacs&r1=1.180&r2=1.181
Patches:
Index: server.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/server.el,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -b -r1.180 -r1.181
--- server.el 10 Jan 2009 13:04:37 -0000 1.180
+++ server.el 10 Jan 2009 13:07:04 -0000 1.181
@@ -615,8 +615,6 @@
(defun server-create-tty-frame (tty type proc)
(add-to-list 'frame-inherited-parameters 'client)
- (unless tty (error "Invalid terminal device"))
- (unless type (error "Invalid terminal type"))
(let ((frame
(server-with-environment (process-get proc 'env)
'("LANG" "LC_CTYPE" "LC_ALL"
@@ -627,24 +625,22 @@
"TERMINFO_DIRS" "TERMPATH"
;; rxvt wants these
"COLORFGBG" "COLORTERM")
- (let ((ws (if (eq window-system 'pc) 'pc nil))
- ;; Ignore nowait here; we always need to clean up
- ;; opened ttys when the client dies.
- (parameters `((client . ,proc)
- ;; This is left over from an earlier
- ;; attempt at causing a process run in
- ;; the server process to use the
+ (make-frame-on-tty tty type
+ ;; Ignore nowait here; we always need to
+ ;; clean up opened ttys when the client dies.
+ `((client . ,proc)
+ ;; This is a leftover from an earlier
+ ;; attempt at making it possible for process
+ ;; run in the server process to use the
;; environment of the client process.
- ;; It has no effect now and to make it
- ;; work we'd need to decide how to make
- ;; process-environment interact with
- ;; client envvars, and then to change
- ;; the C functions `child_setup' and
+ ;; It has no effect now and to make it work
+ ;; we'd need to decide how to make
+ ;; process-environment interact with client
+ ;; envvars, and then to change the
+ ;; C functions `child_setup' and
;; `getenv_internal' accordingly.
- (environment . ,(process-get proc 'env)))))
- (make-frame `((window-system . ,ws)
- (tty . ,tty)
- (tty-type . ,type) . ,parameters))))))
+ (environment . ,(process-get proc 'env)))))))
+
;; ttys don't use the `display' parameter, but callproc.c does to set
;; the DISPLAY environment on subprocesses.
(set-frame-parameter frame 'display
- [Emacs-diffs] emacs/lisp server.el,
Chong Yidong <=