Fix bootstrap error during loadup.

* lisp/loadup.el: Load dnd.el before x-dnd.el.

* src/Makefile.in (SOME_MACHINE_LISP): Add dnd.elc.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-329

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 8ada4710400bb0b594869af7f57553128b52cb9d..0685caf78aa9a4b30fe5ede46bf6b16f367d963b 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -196,6 +196,7 @@
 (when (fboundp 'x-create-frame)
   (load "mouse")
   (load "international/fontset")
+  (load "dnd")
   (load "x-dnd")
   (load "term/x-win"))
 

diff --git a/src/Makefile.in b/src/Makefile.in
index ec5ff5a4c5f98f0886fa16f628d591ca7ad0ea92..874d2b84303c5dedf31e9cc48ee2a19cba26f13c 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -898,7 +898,8 @@ SOME_MACHINE_LISP = ${dotdot}/lisp/mouse.elc \
   ${dotdot}/lisp/international/ccl.elc \
   ${dotdot}/lisp/international/codepage.elc \
   ${dotdot}/lisp/mouse.elc ${dotdot}/lisp/international/fontset.elc \
-  ${dotdot}/lisp/x-dnd.elc ${dotdot}/lisp/term/x-win.elc
+  ${dotdot}/lisp/dnd.elc ${dotdot}/lisp/x-dnd.elc \
+  ${dotdot}/lisp/term/x-win.elc
 
 /* Construct full set of libraries to be linked.
    Note that SunOS needs -lm to come before -lc; otherwise, you get