Mercurial > emacs
changeset 83124:d153d9579f9b
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
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Tue, 18 May 2004 19:58:00 +0000 |
| parents | ad01ab3c6f4d |
| children | b545019c77b0 |
| files | README.multi-tty lisp/loadup.el lisp/server.el mac/makefile.MPW src/Makefile.in |
| diffstat | 5 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/README.multi-tty Tue May 18 19:12:15 2004 +0000 +++ b/README.multi-tty Tue May 18 19:58:00 2004 +0000 @@ -182,6 +182,7 @@ Robert J. Chassell <bob at rattlesnake dot com> Romain Francoise <romain at orebokech dot com> Ami Fischman <ami at fischman dot org> +Friedrich Delgado Friedrichs <friedel at nomaden dot org> Istvan Marko <mi-mtty ar kismala dot com> Dan Nicolaescu <dann at ics dot uci dot edu> Gergely Nagy <algernon at debian dot org>
--- a/lisp/loadup.el Tue May 18 19:12:15 2004 +0000 +++ b/lisp/loadup.el Tue May 18 19:58:00 2004 +0000 @@ -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")))
--- a/lisp/server.el Tue May 18 19:12:15 2004 +0000 +++ b/lisp/server.el Tue May 18 19:58:00 2004 +0000 @@ -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 @@ (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.
--- a/mac/makefile.MPW Tue May 18 19:12:15 2004 +0000 +++ b/mac/makefile.MPW Tue May 18 19:58:00 2004 +0000 @@ -1017,6 +1017,7 @@ {Lisp}international:codepage.elc ¶ {Lisp}abbrev.elc ¶ {Lisp}buff-menu.elc ¶ + {Lisp}server.elc ¶ {Lisp}byte-run.elc ¶ {Lisp}cus-start.el ¶ {Lisp}custom.elc ¶
--- a/src/Makefile.in Tue May 18 19:12:15 2004 +0000 +++ b/src/Makefile.in Tue May 18 19:58:00 2004 +0000 @@ -699,6 +699,7 @@ 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 @@ shortlisp= \ ../lisp/abbrev.elc \ ../lisp/buff-menu.elc \ + ../lisp/server.elc \ ../lisp/button.elc \ ../lisp/emacs-lisp/byte-run.elc \ ../lisp/cus-face.elc \