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

2 files changed, 4 insertions, 1 deletions

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 36b9904f4f1..bb00fe8fbbb 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -163,6 +163,7 @@
       (load "vmsproc")))
 (load "abbrev")
 (load "buff-menu")
+(load "server") ; server-getenv is used throughout the terminal initialization code
 (if (eq system-type 'vax-vms)
     (progn
       (load "vms-patch")))
diff --git a/lisp/server.el b/lisp/server.el
index 57d4b7600b8..7156b7322e3 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -8,6 +8,7 @@
 ;; Keywords: processes
 
 ;; 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.
 
@@ -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)
 
-(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.
 VARIABLE should be a string.  Value is nil if VARIABLE is undefined in
 the environment.  Otherwise, value is a string.