mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-23 07:19:15 +00:00
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
This commit is contained in:
parent
c23670f81e
commit
35dfa9b69e
@ -182,6 +182,7 @@ to the project by testing, bug reports, and suggestions. Thanks!
|
||||
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>
|
||||
|
@ -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")))
|
||||
|
@ -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.
|
||||
|
@ -1017,6 +1017,7 @@ LispSource =
|
||||
{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 ¶
|
||||
|
@ -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 \
|
||||
|
Loading…
Reference in New Issue
Block a user