From: Karoly Lorentey <lorentey@elte.hu>
Date: Mon, 18 Apr 2005 14:32:14 +0000 (+0000)
Subject: Fix bootstrap error during loadup.
X-Git-Tag: emacs-pretest-23.0.90~11236^2~141^2~271
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=774a8da14bb2520b6adad223ab13f0b64f002872;p=emacs.git

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 8ada4710400..0685caf78aa 100644
--- 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 ec5ff5a4c5f..874d2b84303 100644
--- 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