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

1 files changed, 2 insertions, 0 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index 30dbc9df0cf..15cc8003e59 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -699,6 +699,7 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj) $(LIBO
 lisp= \
         ${lispsource}abbrev.elc \
         ${lispsource}buff-menu.elc \
+        ${lispsource}server.elc \
         ${lispsource}button.elc \
         ${lispsource}emacs-lisp/byte-run.elc \
         ${lispsource}cus-face.elc \
@@ -791,6 +792,7 @@ lisp= \
 shortlisp= \
         ../lisp/abbrev.elc \
         ../lisp/buff-menu.elc \
+        ../lisp/server.elc \
         ../lisp/button.elc \
         ../lisp/emacs-lisp/byte-run.elc \
         ../lisp/cus-face.elc \