From: Karoly Lorentey <lorentey@elte.hu>
Date: Mon, 9 May 2005 16:13:15 +0000 (+0000)
Subject: Merged from miles@gnu.org--gnu-2005 (patch 292-295)
X-Git-Tag: emacs-pretest-23.0.90~11236^2~141^2~258
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=85dc59a9ff65aaf6b8e6a0c4452f74b7dade88fd;p=emacs.git

Merged from miles@gnu.org--gnu-2005 (patch 292-295)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-292
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-293
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-294
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-295
   Update from CVS

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

85dc59a9ff65aaf6b8e6a0c4452f74b7dade88fd
diff --cc lisp/loadup.el
index 0963f5150ad,53d82323feb..d5f97e49245
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@@ -192,18 -190,8 +192,18 @@@
        (load "emacs-lisp/float-sup")))
  (message "%s" (garbage-collect))
  
 +;; Load auxiliary settings for X displays if we support them.
 +(when (fboundp 'x-create-frame)
 +  (load "mouse")
 +  (load "international/fontset")
 +  (load "dnd")
 +  (load "x-dnd")
 +  (load "term/x-win"))
 +
 +(message "%s" (garbage-collect))
 +
  (load "vc-hooks")
- (load "jka-comp-hook")
+ (load "jka-cmpr-hook")
  (load "ediff-hook")
  (if (fboundp 'x-show-tip) (load "tooltip"))
  (message "%s" (garbage-collect))