Commit 35dfa9b6 authored by Karoly Lorentey's avatar Karoly Lorentey
Browse files

Fix fatal error during startup (rep. by Friedrich Delgado Friedrichs)

lisp/loadup.el: Unconditionally preload server.

lisp/server.el: Change server-getenv to a simple defun.

src/Makefile.in (lisp, shortlisp): Added server.elc.
mac/makefile.MPW (LispSource): Ditto.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-164
parent c23670f8
...@@ -182,6 +182,7 @@ to the project by testing, bug reports, and suggestions. Thanks! ...@@ -182,6 +182,7 @@ to the project by testing, bug reports, and suggestions. Thanks!
Robert J. Chassell <bob at rattlesnake dot com> Robert J. Chassell <bob at rattlesnake dot com>
Romain Francoise <romain at orebokech dot com> Romain Francoise <romain at orebokech dot com>
Ami Fischman <ami at fischman dot org> Ami Fischman <ami at fischman dot org>
Friedrich Delgado Friedrichs <friedel at nomaden dot org>
Istvan Marko <mi-mtty ar kismala dot com> Istvan Marko <mi-mtty ar kismala dot com>
Dan Nicolaescu <dann at ics dot uci dot edu> Dan Nicolaescu <dann at ics dot uci dot edu>
Gergely Nagy <algernon at debian dot org> Gergely Nagy <algernon at debian dot org>
......
...@@ -163,6 +163,7 @@ ...@@ -163,6 +163,7 @@
(load "vmsproc"))) (load "vmsproc")))
(load "abbrev") (load "abbrev")
(load "buff-menu") (load "buff-menu")
(load "server") ; server-getenv is used throughout the terminal initialization code
(if (eq system-type 'vax-vms) (if (eq system-type 'vax-vms)
(progn (progn
(load "vms-patch"))) (load "vms-patch")))
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
;; Keywords: processes ;; Keywords: processes
;; Changes by peck@sun.com and by rms. ;; Changes by peck@sun.com and by rms.
;; Overhaul by Karoly Lorentey <lorentey@elte.hu> for multi-tty support.
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
...@@ -872,7 +873,8 @@ Arg NEXT-BUFFER is a suggestion; if it is a live buffer, use it." ...@@ -872,7 +873,8 @@ Arg NEXT-BUFFER is a suggestion; if it is a live buffer, use it."
(global-set-key "\C-x#" 'server-edit) (global-set-key "\C-x#" 'server-edit)
(defsubst server-getenv (variable &optional frame) ;;;###autoload
(defun server-getenv (variable &optional frame)
"Get the value of VARIABLE in the client environment of frame FRAME. "Get the value of VARIABLE in the client environment of frame FRAME.
VARIABLE should be a string. Value is nil if VARIABLE is undefined in VARIABLE should be a string. Value is nil if VARIABLE is undefined in
the environment. Otherwise, value is a string. the environment. Otherwise, value is a string.
......
...@@ -1017,6 +1017,7 @@ LispSource = ...@@ -1017,6 +1017,7 @@ LispSource =
{Lisp}international:codepage.elc {Lisp}international:codepage.elc
{Lisp}abbrev.elc {Lisp}abbrev.elc
{Lisp}buff-menu.elc {Lisp}buff-menu.elc
{Lisp}server.elc
{Lisp}byte-run.elc {Lisp}byte-run.elc
{Lisp}cus-start.el {Lisp}cus-start.el
{Lisp}custom.elc {Lisp}custom.elc
......
...@@ -699,6 +699,7 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj) $(LIBO ...@@ -699,6 +699,7 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj) $(LIBO
lisp= \ lisp= \
${lispsource}abbrev.elc \ ${lispsource}abbrev.elc \
${lispsource}buff-menu.elc \ ${lispsource}buff-menu.elc \
${lispsource}server.elc \
${lispsource}button.elc \ ${lispsource}button.elc \
${lispsource}emacs-lisp/byte-run.elc \ ${lispsource}emacs-lisp/byte-run.elc \
${lispsource}cus-face.elc \ ${lispsource}cus-face.elc \
...@@ -791,6 +792,7 @@ lisp= \ ...@@ -791,6 +792,7 @@ lisp= \
shortlisp= \ shortlisp= \
../lisp/abbrev.elc \ ../lisp/abbrev.elc \
../lisp/buff-menu.elc \ ../lisp/buff-menu.elc \
../lisp/server.elc \
../lisp/button.elc \ ../lisp/button.elc \
../lisp/emacs-lisp/byte-run.elc \ ../lisp/emacs-lisp/byte-run.elc \
../lisp/cus-face.elc \ ../lisp/cus-face.elc \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment