aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaroly Lorentey2005-03-28 04:24:51 +0000
committerKaroly Lorentey2005-03-28 04:24:51 +0000
commit4a932511428a2b61ec51deebd6e16ec1efbda800 (patch)
treed89ec69fba0472158ce0349eaaa181d26ef161b3
parentea4c170ae470bafc29ab8a68aa9efc2d00650966 (diff)
downloademacs-4a932511428a2b61ec51deebd6e16ec1efbda800.tar.gz
emacs-4a932511428a2b61ec51deebd6e16ec1efbda800.zip
Fix error when creating tty clients.
* lisp/server.el (server-process-filter): Disable call to configure-display-for-locale. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-323
-rw-r--r--lisp/server.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/server.el b/lisp/server.el
index f0ce3c670e0..b822eff0ae6 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -664,8 +664,11 @@ The following commands are accepted by the client:
664 (server-client-set client 'frame frame) 664 (server-client-set client 'frame frame)
665 (server-client-set client 'tty (display-name frame)) 665 (server-client-set client 'tty (display-name frame))
666 (server-client-set client 'display (frame-display frame)) 666 (server-client-set client 'display (frame-display frame))
667
667 ;; Set up display for the remote locale. 668 ;; Set up display for the remote locale.
668 (configure-display-for-locale) 669 ;; XXX This function has been removed from mule-cmds.el, we need to find another way.
670 ;; (configure-display-for-locale)
671
669 ;; Reply with our pid. 672 ;; Reply with our pid.
670 (server-send-string proc (concat "-emacs-pid " (number-to-string (emacs-pid)) "\n")) 673 (server-send-string proc (concat "-emacs-pid " (number-to-string (emacs-pid)) "\n"))
671 (setq dontkill t))) 674 (setq dontkill t)))