diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-11-07 14:56:19 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-11-07 14:56:19 +0000 |
| commit | 79c3172f78d56cf88c927fb0ff5c3b30fd676686 (patch) | |
| tree | 20932caaa9695f3bb29b543f46107319a687308d /lisp/loadup.el | |
| parent | 9684e4c92f12f7c31f5e6fda7742960b403395f6 (diff) | |
| parent | fab0d3087eb5215a5d08379ac765af27abc28842 (diff) | |
| download | emacs-79c3172f78d56cf88c927fb0ff5c3b30fd676686.tar.gz | |
Merged from miles@gnu.org--gnu-2005 (patch 149-151, 629-641)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-629
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-630
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-631
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-632
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-633
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-634
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-635
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-636
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-637
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-638
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-639
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-640
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-641
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-149
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-150
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-151
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-437
Diffstat (limited to 'lisp/loadup.el')
| -rw-r--r-- | lisp/loadup.el | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el index e1d5e56e2a2..1df6065cb17 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -134,10 +134,11 @@ (load "frame") (load "term/tty-colors") (load "font-core") +(load "emacs-lisp/syntax") +(load "font-lock") +(load "jit-lock") -(if (fboundp 'frame-face-alist) - (progn - (load "facemenu"))) +(load "facemenu") (if (fboundp 'track-mouse) (progn (load "mouse") @@ -166,6 +167,19 @@ (load "abbrev") (load "buff-menu") (load "server") ; server-getenv is used throughout the terminal initialization code + +(if (fboundp 'x-create-frame) + (progn + (load "image") + (load "international/fontset") + (load "dnd") + (load "mwheel") + (load "tool-bar") + (load "term/x-win"))) +(if (featurep 'x) + (load "x-dnd")) +(message "%s" (garbage-collect)) + (if (eq system-type 'vax-vms) (progn (load "vms-patch"))) @@ -193,20 +207,11 @@ (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-cmpr-hook") (load "ediff-hook") (if (fboundp 'x-show-tip) (load "tooltip")) + (message "%s" (garbage-collect)) ;If you want additional libraries to be preloaded and their |