diff options
| author | Miles Bader <miles@gnu.org> | 2006-01-16 08:37:27 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-01-16 08:37:27 +0000 |
| commit | 41882805d6711e32ac0f066119226d84dbdedc13 (patch) | |
| tree | 44f756cef3fbc4de2f229e93613a1a326da7f55d /lisp/loadup.el | |
| parent | 6a2bd1a5019d2130c87ac5cf17f1322bf614b624 (diff) | |
| parent | 28f74fdf77eaab2e9daf54e2d5b0b729c5201e4f (diff) | |
| download | emacs-41882805d6711e32ac0f066119226d84dbdedc13.tar.gz | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-97
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 616-696)
- Add lisp/mh-e/.arch-inventory
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: lisp/smerge-mode.el: Add 'tools' to file keywords.
- lisp/gnus/ChangeLog: Remove duplicate entry
* gnus--rel--5.10 (patch 147-181)
- Update from CVS
- Merge from emacs--cvs-trunk--0
- Update from CVS: lisp/mml.el (mml-preview): Doc fix.
- Update from CVS: texi/message.texi: Fix default values.
- Update from CVS: texi/gnus.texi (RSS): Addition.
Diffstat (limited to 'lisp/loadup.el')
| -rw-r--r-- | lisp/loadup.el | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el index 29c1fb90066..9767c33d61b 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -124,10 +124,13 @@ (load "frame") (load "term/tty-colors") (load "font-core") +;; facemenu must be loaded before font-lock, because `facemenu-keymap' +;; needs to be defined when font-lock is loaded. +(load "facemenu") +(load "emacs-lisp/syntax") +(load "font-lock") +(load "jit-lock") -(if (fboundp 'frame-face-alist) - (progn - (load "facemenu"))) (if (fboundp 'track-mouse) (progn (load "mouse") @@ -136,6 +139,7 @@ (load "select"))) (load "emacs-lisp/timer") (load "isearch") +(load "rfn-eshadow") (message "%s" (garbage-collect)) (load "menu-bar") @@ -156,6 +160,18 @@ (load "vmsproc"))) (load "abbrev") (load "buff-menu") + +(if (fboundp 'x-create-frame) + (progn + (load "image") + (load "international/fontset") + (load "dnd") + (load "mwheel") + (load "tool-bar"))) +(if (featurep 'x) + (load "x-dnd")) +(message "%s" (garbage-collect)) + (if (eq system-type 'vax-vms) (progn (load "vms-patch"))) @@ -187,6 +203,7 @@ (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 |